X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-oauth.yaml;h=4d5ac75a2f8d9dbc0296a576cee844fda726254d;hb=b3a6814af9ab63fa59d0233f5d2ebb032f0b1597;hp=9721b39604ebb8754e9013c37a75b544ce285b65;hpb=e9529d3deb86757d7b2eabaff4696c146cd0bad8;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index 9721b396..4d5ac75a 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -62,41 +62,10 @@ spec:
         - 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 && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - 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: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-OAUTH
@@ -116,6 +85,4 @@ spec:
           containerPort: {{.Values.services.oauth.internal_port}}
         env:
         - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}