X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-cm.yaml;h=e64da6cc5aff0fd87843aad9d49ae19dd0a8fb6f;hb=48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43;hp=0a4c314946a70a0cead9b3a04ec5d6712aa05bca;hpb=93871ff58e90a91d359f72b00a92fe1e28310b82;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index 0a4c3149..e64da6cc 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -1,3 +1,22 @@
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  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.
+##  ============LICENSE_END====================================================
+##
 ###
 ### AAF-CERTMAN
 ###
@@ -13,7 +32,7 @@ spec:
     - name: aaf-cm
       protocol: TCP
       port: 8150
-      NodePort: 30084
+      nodePort: 30084
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -22,7 +41,7 @@ metadata:
   labels:
     app: aaf-cm
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.cm.replicas }}
   selector:
     matchLabels:
       app: aaf-cm
@@ -33,40 +52,53 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+      - name: aaf-config-vol
+        persistentVolumeClaim:
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
+        persistentVolumeClaim:
+          claimName: aaf-status-pvc
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
+        - command:
+            - /bin/sh
+            - -c
+            - |
+              chmod -R 775 /opt/app/aaf/status
+              chown -R 1000:1000 /opt/app/aaf/status
+              chmod -R 775 /opt/app/osaaf
+              chown -R 1000:1000 /opt/app/osaaf
+          image: busybox:1.28
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: init-sysctl
+          volumeMounts:
+            - mountPath: /opt/app/aaf/status
+              name: aaf-status-vol
+            - mountPath: /opt/app/osaaf
+              name: aaf-config-vol
+        - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm "]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: AAF_REGISTER_AS
-              value: "aaf-cm"
-            - name: AAF_LOCATOR_AS
-              value: "{{ .Values.cadi.aaf_locate_as }}"
-            - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: CASS_HOST
-              value: "aaf-cass"
+            - mountPath: "/opt/app/aaf/status"
+              name: aaf-status-vol
       containers:
 ###
 ### AAF-CERTMAN
 ###
-      - name: {{ .Chart.Name }}-cm
-        image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }}
+      - name: aaf-cm
+        image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_cm","sleep","45", "/opt/app/aaf/bin/cm"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-locate && exec bin/cm"]
         volumeMounts:
-          -  mountPath: "/opt/app/osaaf"
-             name: {{ .Chart.Name }}-config-vol
+        -  mountPath: "/opt/app/osaaf"
+           name: aaf-config-vol
+        -  mountPath: "/opt/app/aaf/status"
+           name: aaf-status-vol
         ports:
         - name: aaf-cm
           protocol: TCP
           containerPort: 8150
+        env:
+        - name: aaf_locator_ns
+          value: {{ .Release.Namespace }}