Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / so-ve-vnfm-adapter / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
index 8471540..606ceb4 100755 (executable)
--- a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
@@ -15,21 +15,16 @@
 */}}
 
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ include "common.getPort" (dict "global" . "name" "http") }}
 
 vevnfmadapter:
-  {{ if (include "common.needTLS" .) }}
-  endpoint: https://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
-  {{ else }}
-  endpoint: http://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
-  {{ end }}
+  endpoint: http://msb-iag:80/api/{{ include "common.servicename" . }}/v1
 
 aai:
-  {{ if (include "common.needTLS" .) }}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
-  {{ else }}
-  endpoint: http://aai.{{ include "common.namespace" . }}:8080
-  {{ end }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
 
 dmaap:
   endpoint: http://message-router.{{ include "common.namespace" . }}:3904