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 "[SO] update the so-etsi-nfvo-ns-lcm version"
[oom.git]
/
kubernetes
/
so
/
components
/
so-vnfm-adapter
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
b/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
index
7fc4b95
..
9d98803
100755
(executable)
--- a/
kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
@@
-30,14
+30,14
@@
server:
port: {{ index .Values.containerPort }}
ssl:
key-alias: so@so.onap.org
port: {{ index .Values.containerPort }}
ssl:
key-alias: so@so.onap.org
- key-
-store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L'
- key-store:
classpath:so-vnfm-adapter.p12
+ key-
store-password: ${KEYSTORE_PASSWORD}
+ key-store:
file:${KEYSTORE}
key-store-type: PKCS12
http:
client:
ssl:
key-store-type: PKCS12
http:
client:
ssl:
- trust-store:
classpath:org.onap.so.trust.jks
- trust-store-password:
',sx#.C*W)]wVgJC6ccFHI#:H'
+ trust-store:
file:${TRUSTSTORE}
+ trust-store-password:
${TRUSTSTORE_PASSWORD}
mso:
key: {{ .Values.mso.key }}
site-name: localSite
mso:
key: {{ .Values.mso.key }}
site-name: localSite
@@
-60,7
+60,7
@@
etsi-catalog-manager:
http:
client:
ssl:
http:
client:
ssl:
- trust-store: ${TRUSTSTORE}
+ trust-store:
file:
${TRUSTSTORE}
trust-store-password: ${TRUSTSTORE_PASSWORD}
{{- else }}
endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
trust-store-password: ${TRUSTSTORE_PASSWORD}
{{- else }}
endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1