X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-sdc-controller%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=ffa66e9d788f9c633af28f95462aeb53fe435b6e;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=b20e33a1404daf3ca44cd5e0ebb3aaa4cfd44572;hpb=fd0c86d1817fed1c6e94aed7c2ace4e335d8be02;p=oom.git

diff --git a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index b20e33a140..ffa66e9d78 100755
--- a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
@@ -63,19 +63,28 @@ mso:
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
       auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.requestDb.auth )}}
   aai:
+    {{ if (include "common.needTLS" .) }}
     endpoint: https://aai.{{ include "common.namespace" . }}:8443
+    {{ else }}
+    endpoint: http://aai.{{ include "common.namespace" . }}:8080
+    {{ end }}
   asdc-connections:
     asdc-controller1:
       user: mso
       consumerGroup: SO-OpenSource-Env11
       consumerId: SO-COpenSource-Env11
       environmentName: AUTO
+      {{ if (include "common.needTLS" .) }}
       asdcAddress: sdc-be.{{ include "common.namespace" . }}:8443
+      {{ else }}
+      asdcAddress: sdc-be.{{ include "common.namespace" . }}:8080
+      {{ end }}
       password: {{ index .Values "mso" "asdc-connections" "asdc-controller1" "password" }}
       pollingInterval: 60
       pollingTimeout: 60
       relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
       useHttpsWithDmaap: false
+      useHttpsWithSdc: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
       activateServerTLSAuth: false
       keyStorePassword:
       keyStorePath: