X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-nssmf-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=633ac7dcc1c5343c8129c4ca994421dd534bd601;hb=refs%2Fheads%2Fmaster;hp=eaa26637e6b4264d40d117ca658bd9d50cbeb51e;hpb=0096ca03c48a0d2aa01a239080ca6d224bea7eca;p=oom.git

diff --git a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
index eaa26637e6..633ac7dcc1 100755
--- a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
@@ -14,8 +14,8 @@
 # limitations under the License.
 */}}
 aai:
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  auth: {{ .Values.aai.auth }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
 logging:
   path: logs
 spring:
@@ -40,19 +40,22 @@ spring:
         password: ${ACTUATOR_PASSWORD}
         role: ACTUATOR
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
   tomcat:
     max-threads: 50
 
 mso:
   site-name: localSite
-  logPath: ./logs/nssmf
+  logPath: ./logs/nssmf-adapter
   msb-ip: msb-iag.{{ include "common.namespace" . }}
   msb-port: 80
   adapters:
     requestDb:
-      endpoint: https://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.adapters.requestDb.auth )}}
+      endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+      auth: {{ .Values.mso.adapters.requestDb.auth }}
 #Actuator
 management:
   endpoints: