Removed service header

2026-07-01 03:22:02 -04:00 · 2018-09-18 12:55:35 +03:00
parent 1d4b70e8ad
commit 94ded13935
3 changed files with 107 additions and 112 deletions
@@ -1,36 +1,34 @@
-version: '2'
-services:
-  pxd:
-    labels:
-      io.rancher.container.dns: 'true'
-      io.rancher.container.hostname_override: container_name
-      io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
-      {{- if .Values.SC_LABEL_VALUE }}
-      io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
-      {{- end }}
-      io.rancher.container.pull_image: always
-    image: registry.vxcontrol.com:8443/pxd:edge
-    container_name: px
-    ipc: host
-    net: host
-    privileged: true
-    environment:
-      CLUSTER_ID: ${CLUSTER_ID}
-      KVDB: ${KVDB}
-      HDR_DIR: ${HEADER_DIR}
-      USE_DISKS: ${USE_DISKS}
-      ENABLE_ATTR_CACHE: true
-    external_links:
-      - ${ETCD_SERVICE_LB}:etcd
-      - ${ETCD_SERVICE_SERVERS}:etcd_s
-    volumes:
-       - /dev:/dev
-       - ${HEADER_DIR}:${HEADER_DIR}
-       - /run/docker/plugins:/run/docker/plugins
-       - /var/lib/osd:/var/lib/osd:shared
-       - /etc/pwx:/etc/pwx
-       - /opt/pwx/bin:/export_bin
-       - /var/run/docker.sock:/var/run/docker.sock
-       - /var/cores:/var/cores
-       - /proc:/hostproc
-    command: -c ${CLUSTER_ID} -k ${KVDB} ${USE_DISKS}
+pxd:
+  labels:
+    io.rancher.container.dns: 'true'
+    io.rancher.container.hostname_override: container_name
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    {{- if .Values.SC_LABEL_VALUE }}
+    io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
+    {{- end }}
+    io.rancher.container.pull_image: always
+  image: registry.vxcontrol.com:8443/pxd:edge
+  container_name: px
+  ipc: host
+  net: host
+  privileged: true
+  environment:
+    CLUSTER_ID: ${CLUSTER_ID}
+    KVDB: ${KVDB}
+    HDR_DIR: ${HEADER_DIR}
+    USE_DISKS: ${USE_DISKS}
+    ENABLE_ATTR_CACHE: true
+  external_links:
+    - ${ETCD_SERVICE_LB}:etcd
+    - ${ETCD_SERVICE_SERVERS}:etcd_s
+  volumes:
+     - /dev:/dev
+     - ${HEADER_DIR}:${HEADER_DIR}
+     - /run/docker/plugins:/run/docker/plugins
+     - /var/lib/osd:/var/lib/osd:shared
+     - /etc/pwx:/etc/pwx
+     - /opt/pwx/bin:/export_bin
+     - /var/run/docker.sock:/var/run/docker.sock
+     - /var/cores:/var/cores
+     - /proc:/hostproc
+  command: -c ${CLUSTER_ID} -k ${KVDB} ${USE_DISKS}
@@ -1,35 +1,33 @@
-version: '2'
-services:
-  portworx:
-    image: portworx/oci-monitor:1.5.0
-    container_name: px-oci-mon
-    privileged: true
-    labels:
-      io.rancher.container.dns: 'true'
-      {{- if eq .Values.INSTALL_SCALE "global" }}
-      io.rancher.scheduler.global: 'true'
-      {{- end }}
-      {{- if .Values.SC_LABEL_VALUE }}
-      io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
-      {{- end }}
-      io.rancher.container.pull_image: always
-      io.rancher.container.hostname_override: container_name
-      io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
-      io.rancher.scheduler.affinity:host_label_ne: px/enabled=false
-    environment:
-      CLUSTER_ID: ${CLUSTER_ID}
-      KVDB: ${KVDB}
-      USE_DISKS: ${USE_DISKS}
-      EXTRA_OPTS: ${EXTRA_OPTS}
-      ENABLE_ATTR_CACHE: true
-    external_links:
-      - ${ETCD_SERVICE_LB}:etcd
-      - ${ETCD_SERVICE_SERVERS}:etcd_s
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:rprivate
-      - /etc/pwx:/etc/pwx:rprivate
-      - /opt/pwx:/opt/pwx:rprivate
-      - /etc/systemd/system:/etc/systemd/system:rprivate
-      - /proc/1/ns:/host_proc/1/ns:rprivate
-      - /var/run/dbus:/var/run/dbus:rprivate
-    command: -c ${CLUSTER_ID} -k ${KVDB} ${USE_DISKS} -x rancher --endpoint 0.0.0.0:9015 ${EXTRA_OPTS}
+portworx:
+  image: portworx/oci-monitor:1.5.0
+  container_name: px-oci-mon
+  privileged: true
+  labels:
+    io.rancher.container.dns: 'true'
+    {{- if eq .Values.INSTALL_SCALE "global" }}
+    io.rancher.scheduler.global: 'true'
+    {{- end }}
+    {{- if .Values.SC_LABEL_VALUE }}
+    io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
+    {{- end }}
+    io.rancher.container.pull_image: always
+    io.rancher.container.hostname_override: container_name
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+    io.rancher.scheduler.affinity:host_label_ne: px/enabled=false
+  environment:
+    CLUSTER_ID: ${CLUSTER_ID}
+    KVDB: ${KVDB}
+    USE_DISKS: ${USE_DISKS}
+    EXTRA_OPTS: ${EXTRA_OPTS}
+    ENABLE_ATTR_CACHE: true
+  external_links:
+    - ${ETCD_SERVICE_LB}:etcd
+    - ${ETCD_SERVICE_SERVERS}:etcd_s
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock:rprivate
+    - /etc/pwx:/etc/pwx:rprivate
+    - /opt/pwx:/opt/pwx:rprivate
+    - /etc/systemd/system:/etc/systemd/system:rprivate
+    - /proc/1/ns:/host_proc/1/ns:rprivate
+    - /var/run/dbus:/var/run/dbus:rprivate
+  command: -c ${CLUSTER_ID} -k ${KVDB} ${USE_DISKS} -x rancher --endpoint 0.0.0.0:9015 ${EXTRA_OPTS}
@@ -1,46 +1,45 @@
-version: '2'
-services:
-  etcd:
-    image: registry.vxcontrol.com:8443/etcd:v3.3.8
-    labels:
-        io.rancher.scheduler.affinity:host_label_soft: etcd=true
-        io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
-        {{- if .Values.SC_LABEL_VALUE }}
-        io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
-        {{- end }}
-        io.rancher.sidekicks: data
-    environment:
-        RANCHER_DEBUG: '${RANCHER_DEBUG}'
-        EMBEDDED_BACKUPS: '${EMBEDDED_BACKUPS}'
-        BACKUP_PERIOD: '${BACKUP_PERIOD}'
-        BACKUP_RETENTION: '${BACKUP_RETENTION}'
-        ETCD_ELECTION_TIMEOUT: 5000
-    volumes:
-    - ${BACKUP_LOCATION}:/data-backup
-    volumes_from:
-    - data
-    external_links:
-    - etcd-lb:loadbalancer
-  data:
-    image: busybox
-    command: /bin/true
-    volumes:
-    - pdata-{{.Stack.Name}}:/pdata
-    volume_driver: ${STORAGE_DRIVER}
-    labels:
-      io.rancher.container.start_once: 'true'
+etcd:
+  image: registry.vxcontrol.com:8443/etcd:v3.3.8
+  labels:
+      io.rancher.scheduler.affinity:host_label_soft: etcd=true
+      io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
      {{- if .Values.SC_LABEL_VALUE }}
      io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
      {{- end }}
-  etcd-lb:
-    expose:
-    - 2379:2379/tcp
-    tty: true
-    image: rancher/load-balancer-service
-    links:
-    - etcd:etcd
-    stdin_open: true
+      io.rancher.sidekicks: data
+  environment:
+      RANCHER_DEBUG: '${RANCHER_DEBUG}'
+      EMBEDDED_BACKUPS: '${EMBEDDED_BACKUPS}'
+      BACKUP_PERIOD: '${BACKUP_PERIOD}'
+      BACKUP_RETENTION: '${BACKUP_RETENTION}'
+      ETCD_ELECTION_TIMEOUT: 5000
+  volumes:
+  - ${BACKUP_LOCATION}:/data-backup
+  volumes_from:
+  - data
+  external_links:
+  - etcd-lb:loadbalancer
+data:
+  image: busybox
+  command: /bin/true
+  net: none
+  volumes:
+  - pdata-{{.Stack.Name}}:/pdata
+  volume_driver: ${STORAGE_DRIVER}
+  labels:
+    io.rancher.container.start_once: 'true'
    {{- if .Values.SC_LABEL_VALUE }}
-    labels:
-      io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
+    io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
    {{- end }}
+etcd-lb:
+  expose:
+  - 2379:2379/tcp
+  tty: true
+  image: rancher/load-balancer-service
+  links:
+  - etcd:etcd
+  stdin_open: true
+  {{- if .Values.SC_LABEL_VALUE }}
+  labels:
+    io.rancher.scheduler.affinity:host_label: ${SC_LABEL_VALUE}
+  {{- end }}