X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-vnfm-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=9d98803c8eecceb74889947052f66785a27e45a8;hb=d5936d4446ba47fc04e2f1ce56672233460af1a2;hp=e8d625ed7a6343d745afcd2539f5d03c6ce30a48;hpb=017ccc04e3d54dfff43e66c5e5d3b44bbf11a31b;p=oom.git

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 e8d625ed7a..9d98803c8e 100755
--- a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2019 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # 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 )}}
   version: v15
@@ -28,14 +30,14 @@ server:
   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:
-      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
@@ -58,7 +60,7 @@ etsi-catalog-manager:
   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