X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-service.yaml;h=96efa75cdc3033d03a3847cbdf4713d29042e74f;hb=b3a6814af9ab63fa59d0233f5d2ebb032f0b1597;hp=2b2749844c1b6a800641b954c455e119706b1c5f;hpb=513471c517baae37437dca2d1af6d2bdb31ab128;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index 2b274984..96efa75c 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -70,36 +70,38 @@ spec:
           env:
             - name: aaf_env
               value: "{{ .Values.services.aaf_env }}"
-            - name: cadi_latitude
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: cadi_longitude
-              value: "{{ .Values.services.cadi_longitude }}"
+            - name: aaf_id
+              value: "{{ .Values.services.aaf_id }}"
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
               value: "{{ .Release.Namespace }}"
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: aaf_locator_fqdn
+              value: "{{.Values.services.fqdn}}"
             - name: aaf_locator_public_fqdn
               value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
+            - name: cadi_latitude
+              value: "{{ .Values.services.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.services.cadi_longitude }}"
+            - name: cm_always_ignore_ips
+              value: "true"
             - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
+              value: "{{.Values.services.cass.fqdn}}.{{.Release.Namespace }}"
 #            - name: CASSANDRA_USER
 #              value: ""
 #            - name: CASSANDRA_PASSWORD
 #              value: ""
 #           - name: CASSANDRA_PORT
 #              value: ""
-      containers:
 ###
 ### AAF-SERVICE
 ###
+      containers:
       - name: aaf-service
-        image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
+        image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-cass && exec bin/service"]
         volumeMounts: