aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-12 20:21:24 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-12 20:21:24 +0000
commit8a07775e196d6837f8963da6a5d6d5e1077189d5 (patch)
tree2c7146900d40e909913e8d2a2489b0c9c0940300
parentdf774ed8442dc77bfe666081fee9409e51c737f1 (diff)
parent9a637a9e25f6f1126fe8e682dae5276445cf6b0f (diff)
Merge "Fix consul agent start problems"
-rw-r--r--kubernetes/consul/templates/deployment.yaml10
-rw-r--r--kubernetes/consul/values.yaml2
2 files changed, 8 insertions, 4 deletions
diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 68b23917b6..e984e2a72f 100644
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -36,11 +36,15 @@ spec:
spec:
containers:
- image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
- command: ["/usr/local/bin/docker-entrypoint.sh"]
- args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","{{ .Release.Name }}-{{ index .Values "consul-server" "nameOverride" }}.{{ include "common.namespace" .}}"]
+ command:
+ - /bin/sh
+ - "-c"
+ - |
+ cp /tmp/consul/config/* /consul/config
+ /usr/local/bin/docker-entrypoint.sh agent -client 0.0.0.0 -enable-script-checks -join {{ .Release.Name }}-{{ .Values.consulServer.nameOverride }}.{{ include "common.namespace" .}}
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /consul/config
+ - mountPath: /tmp/consul/config
name: consul-agent-config
- mountPath: /consul/scripts
name: consul-agent-scripts-config
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index 74d0ccd048..ee26f542e7 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -32,7 +32,7 @@ image: consul:1.0.0
pullPolicy: Always
#subchart name
-consul-server:
+consulServer:
nameOverride: consul-server
# flag to enable debugging - application support required