X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fconsul%2Ftemplates%2Fconsul-server-deployment.yaml;h=50dfb77d5e90d54d0ef6839fb1e0883da170b5d5;hb=1e5ca467cadaa2d398d448c414075089a3998b7b;hp=e914b6b19836e64200223d340998699001778c4f;hpb=7e46c63029117817ffba478e871777ea0dd17514;p=oom.git

diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml
index e914b6b198..50dfb77d5e 100644
--- a/kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/kubernetes/consul/templates/consul-server-deployment.yaml
@@ -1,12 +1,27 @@
+# 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.disableConsulConsulServer }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
     app: consul-server
   name: consul-server
-  namespace: "{{ .Values.nsPrefix }}-consul"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
-  replicas: 3
+  replicas: {{ .Values.consulServerReplicas }}
   selector:
     matchLabels:
       app: consul-server
@@ -17,14 +32,8 @@ spec:
       name: consul-server
     spec:
       containers:
-      - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}"
+      - image: "{{ .Values.consulserverRegistry }}"
         command: ["/usr/local/bin/docker-entrypoint.sh"]
-        args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}-consul"]
+        args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}"]
         name: consul-server
-        volumeMounts:
-        - mountPath: /consul/config
-          name: consul-server-config
-      volumes:
-      - hostPath:
-          path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config
-        name: consul-server-config
+#{{ end }}