X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fconsul%2Ftemplates%2Fconsul-agent-deployment.yaml;h=2c4a14a9b6f123a114390faf948611a46c8a29c0;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=aa8e096f6a56aa7cb039d89fae2b25cb7bdbf18d;hpb=61468adee9e2c443c336536c29b216209a569478;p=oom.git

diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml
index aa8e096f6a..2c4a14a9b6 100644
--- a/kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/kubernetes/consul/templates/consul-agent-deployment.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #{{ if not .Values.disableConsulConsulAgent }}
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -5,8 +19,9 @@ metadata:
   labels:
     app: consul-agent
   name: consul-agent
-  namespace: "{{ .Values.nsPrefix }}-consul"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.consulAgentReplicas }}
   selector:
     matchLabels:
       app: consul-agent
@@ -17,15 +32,26 @@ spec:
       name: consul-agent
     spec:
       containers:
-      - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}"
+      - image: "{{ .Values.consulagentRegistry }}"
         command: ["/usr/local/bin/docker-entrypoint.sh"]
-        args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}-consul"]
+        args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"]
         name: consul-server
         volumeMounts:
         - mountPath: /consul/config
           name: consul-agent-config
+        - mountPath: /consul/scripts
+          name: consul-agent-scripts-config
+        - mountPath: /consul/certs
+          name: consul-agent-certs-config
       volumes:
-      - hostPath:
-          path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config
+      - configMap:
+          name: consul-agent-configmap
         name: consul-agent-config
-#{{ end }}
\ No newline at end of file
+      - configMap:
+          name: consul-agent-scripts-configmap
+          defaultMode: 0755
+        name: consul-agent-scripts-config
+      - secret:
+          secretName: consul-agent-certs-secret
+        name: consul-agent-certs-config
+#{{ end }}