diff options
Diffstat (limited to 'auth/helm/aaf/templates/aaf-oauth.yaml')
| -rw-r--r-- | auth/helm/aaf/templates/aaf-oauth.yaml | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml index de66b4f1..4d5ac75a 100644 --- a/auth/helm/aaf/templates/aaf-oauth.yaml +++ b/auth/helm/aaf/templates/aaf-oauth.yaml @@ -62,47 +62,16 @@ 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 ### - name: aaf-oauth - image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .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-oauth nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-service && exec bin/oauth"] volumeMounts: @@ -116,6 +85,4 @@ spec: containerPort: {{.Values.services.oauth.internal_port}} env: - name: aaf_locator_ns - valueFrom: - fieldRef: - fieldPath: metadata.namespace + value: {{ .Release.Namespace }} |