Batch, Remove unneeded Classes, refine, etc

[aaf/authz.git] / auth / helm / aaf / templates / aaf-cm.yaml

diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index 0940de4..f8bca52 100644 (file)
--- 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.replicas.cm }}
   selector:
     matchLabels:
       app: aaf-cm
@@ -34,27 +53,44 @@ spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
       - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+        persistentVolumeClaim:
+          claimName: {{ .Chart.Name }}-config-pvc
+      - name: {{ .Chart.Name }}-status-vol
+        persistentVolumeClaim:
+          claimName: {{ .Chart.Name }}-status-pvc
       initContainers:
         - name: {{ .Chart.Name }}-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
+          command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
           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: "aaf-locate"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
               value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: CASS_HOST
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_container_ns
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: aaf_locate_url
+              value: "https://aaf-locate.onap:8095"
+            - name: aaf_locator_public_hostname
+              value: "aaf.osaaf.org"
+            - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
+#            - name: CASSANDRA_USER
+#              value: ""
+#            - name: CASSANDRA_PASSWORD
+#              value: ""
+#           - name: CASSANDRA_PORT
+#              value: ""
       containers:
 ###
 ### AAF-CERTMAN
@@ -62,11 +98,18 @@ spec:
       - name: {{ .Chart.Name }}-cm
         image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .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 aaf-locate && exec bin/cm"]
         volumeMounts:
-          -  mountPath: "/opt/app/osaaf"
-             name: {{ .Chart.Name }}-config-vol
+        -  mountPath: "/opt/app/osaaf"
+           name: {{ .Chart.Name }}-config-vol
+        -  mountPath: "/opt/app/aaf/status"
+           name: {{ .Chart.Name }}-status-vol
         ports:
         - name: aaf-cm
           protocol: TCP
           containerPort: 8150
+        env:
+        - name: aaf_locator_ns
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace