X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Faai%2Ftemplates%2Faai-deployment.yaml;h=1b32463735ad99254e4788c535d7a2213573b743;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=c2220cacdef9f2b7a376e2e235ac26d831156f3b;hpb=626541159636e06fc988a42330ae93339f01ce58;p=oom.git

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index c2220cacde..1b32463735 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,10 +1,25 @@
+# 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.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.aaiServiceReplicas }}
   selector:
     matchLabels:
       app: aai-service
@@ -13,29 +28,24 @@ spec:
       labels:
         app: aai-service
       name: aai-service
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-            "args": [
-                "--container-name", "aai-resources",
-                "--container-name", "aai-traversal"
-            ],
-            "command": [
-                "/root/ready.py"
-            ],
-            "env": [{
-                "name": "NAMESPACE",
-                "valueFrom": {
-                    "fieldRef": {
-                        "apiVersion": "v1",
-                        "fieldPath": "metadata.namespace"
-                    }
-                }
-            }],
-            "image": "{{ .Values.image.readiness }}",
-            "imagePullPolicy": "{{ .Values.pullPolicy }}",
-            "name": "aai-service-readiness"
-          }]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - aai-resources
+        - --container-name
+        - aai-traversal
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: aai-service-readiness
       containers:
       - name: aai-service
         image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}"
@@ -47,6 +57,7 @@ spec:
         - mountPath: /dev/log
           name: aai-service-log
         - mountPath: /usr/local/etc/haproxy/haproxy.cfg
+          subPath: haproxy.cfg
           name: haproxy-cfg
         ports:
         - containerPort: 8080
@@ -64,9 +75,9 @@ spec:
           hostPath:
             path: "/dev/log"
         - name: haproxy-cfg
-          hostPath:
-            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"
+          configMap:
+            name: aai-deployment-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}