X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf-hello%2Ftemplates%2Faaf-hello.yaml;fp=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-hello.yaml;h=c114e5eb57605d5711f93a2841803b78916a7a9c;hb=bd7def7ee2098af56ce66752f59c062d7923fb69;hp=7c91c856512d15354d924c4a1590dd6c8f8f4991;hpb=4fb5572210ac353ab9cf6edd55cc45a5d0381cd4;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
similarity index 58%
rename from auth/helm/aaf/templates/aaf-hello.yaml
rename to auth/helm/aaf-hello/templates/aaf-hello.yaml
index 7c91c856..c114e5eb 100644
--- a/auth/helm/aaf/templates/aaf-hello.yaml
+++ b/auth/helm/aaf-hello/templates/aaf-hello.yaml
@@ -52,63 +52,51 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
-        persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-config-pvc
-      - name: {{ .Chart.Name }}-status-vol
-        persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-status-pvc
+      - name: hello-config-vol
+        emptyDir: {}
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
-          image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
+        - name: hello-config-container
+          image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+            - mountPath: "/opt/app/osaaf/local"
+              name: hello-config-vol
+          command: ["bash","-c","cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh place aaf@aaf.osaaf.org aaf"]
           env:
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
+            - name: "AAF_ENV"
+              value: "DEV"
+            - name: "AAF_FQDN"
+              value: "aaf-locate.onap"
+            - name: "APP_FQDN"
+              value: "aaf"
+            - name: "APP_FQI"
+              value: "aaf@aaf.osaaf.org"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
               value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
+            - name: "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_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
-      containers:
+            - name: "DEPLOY_FQI"
+              value: "deployer@people.osaaf.org"
+            - name: "DEPLOY_PASSWORD"
+              value: "demo123456!"
+
 ###
 ### AAF-HELLO
 ###
-      - name: {{ .Chart.Name }}-hello
+      containers:
+      - name: aaf-hello
         image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && exec bin/hello"]
         volumeMounts:
-        -  mountPath: "/opt/app/osaaf"
-           name: {{ .Chart.Name }}-config-vol
-        -  mountPath: "/opt/app/aaf/status"
-           name: {{ .Chart.Name }}-status-vol
+        -  mountPath: "/opt/app/osaaf/local"
+           name: hello-config-vol
         ports:
         - name: aaf-hello
           protocol: TCP
           containerPort: 8130
-        env:
-        - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace