Several refactorings of ports, and more after pull-request recommendations were suggested by rawmind0

2018-04-09 14:43:15 -07:00
parent dc7c9c36bd
commit 34f243dd6f
4 changed files with 78 additions and 47 deletions
@@ -1,36 +1,35 @@
-version: '2'
-volumes:
-  vault-config:
-    driver: ${volumeDriver}
-  vault-file:
-    driver: ${volumeDriver}
-services:
-  vault-lb:
-    image: rancher/lb-service-haproxy:v0.7.15
-    ports:
-    - 8200:8200/tcp
-    - 8201:8201/tcp
-    labels:
-      io.rancher.scheduler.affinity:host_label: lbhost=true
-      io.rancher.container.agent.role: environmentAdmin,agent
-      io.rancher.container.agent_service.drain_provider: 'true'
-      io.rancher.container.create_agent: 'true'
-  vault:
-    cap_add:
-    - IPC_LOCK
-    image: vault
-    environment:
-      VAULT_LOCAL_CONFIG: ${VAULT_LOCAL_CONFIG}
-{{- if eq .Values.useConsul "true"}}
-    external_links:
-    - ${consulService}:consul
-{{- end}}
-    volumes:
-    - vault-file:/vault/file
-    - vault-config:/vault/config
-    logging:
-      driver: journald
-    command:
-    - server
-    labels:
-      io.rancher.container.pull_image: always
+version: '2'
+volumes:
+  vault-config:
+    driver: ${VOLUME_DRIVER}
+  vault-file:
+    driver: ${VOLUME_DRIVER}
+services:
+  vault-lb:
+    image: rancher/lb-service-haproxy:v0.9.1
+    ports:
+    - ${VAULT_LISTEN_PORT}:8200/tcp
+    - ${VAULT_CLUSTER_PORT}:8201/tcp
+    labels:
+      io.rancher.scheduler.affinity:host_label: lbhost=true
+      io.rancher.container.agent.role: environmentAdmin,agent
+      io.rancher.container.agent_service.drain_provider: 'true'
+      io.rancher.container.create_agent: 'true'
+  vault:
+    cap_add:
+    - IPC_LOCK
+    image: vault:0.9.6
+    environment:
+      VAULT_LOCAL_CONFIG: ${VAULT_LOCAL_CONFIG}
+      VAULT_REDIRECT_INTERFACE: "eth0"
+      VAULT_CLUSTER_INTERFACE: "eth0"
+{{- if eq .Values.USE_CONSUL "true"}}
+    external_links:
+    - ${CONSUL_SERVICE}:consul
+{{- end}}
+    volumes:
+    - vault-file:/vault/file
+    - vault-config:/vault/config
+    command:
+    - server
+