Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[EXTAPI] Make NBI ServiceMesh compatible"
[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
f46219c
..
1a96abf
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,13
+15,24
@@
*/}}
server:
*/}}
server:
+ {{- if include "common.onServiceMesh" . }}
+ forward-headers-strategy: none
+ {{- end }}
port: {{ include "common.getPort" (dict "global" . "name" "http") }}
vevnfmadapter:
port: {{ include "common.getPort" (dict "global" . "name" "http") }}
vevnfmadapter:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
endpoint: https://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
+ {{ else }}
+ endpoint: http://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
+ {{ end }}
aai:
aai:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:80
+ {{ end }}
dmaap:
endpoint: http://message-router.{{ include "common.namespace" . }}:3904
dmaap:
endpoint: http://message-router.{{ include "common.namespace" . }}:3904