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 "[DMAAP] DMaaP ServiceMesh compatibility"
[oom.git]
/
kubernetes
/
so
/
components
/
so-openstack-adapter
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index
e332f98
..
487e931
100755
(executable)
--- a/
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@
-15,7
+15,11
@@
*/}}
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
*/}}
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
+ {{ 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" . }}:8080
+ {{ end }}
server:
port: {{ index .Values.containerPort }}
spring:
server:
port: {{ index .Values.containerPort }}
spring: