[SO] Sync up with the last-minute MSB certificate changes.

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

diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
index 924042d..4128bc3 100755 (executable)
--- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -11,6 +11,10 @@
 # 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 "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
+  version: v15
+  endpoint: https://aai.{{ include "common.namespace" . }}:8443
 spring:
   security:
     usercredentials:
@@ -21,9 +25,41 @@ spring:
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
 server:
-    port: {{ index .Values.containerPort }}
+  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-type: PKCS12
+http:
+  client:
+    ssl:
+      trust-store: classpath:org.onap.so.trust.jks
+      trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H'
 mso:
+  key: {{ .Values.mso.key }}
   site-name: localSite
   logPath: ./logs/vnfm-adapter
-  msb-ip: msb-iag.{{ include "common.namespace" . }}
+  config:
+    cadi: {{ include "cadi.keys" . | nindent 8}}
+  msb-ip: msb-iag
   msb-port: 80
+sdc:
+  username: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.username "value2" .Values.sdc.username )}}
+  password: {{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.password "value2" .Values.sdc.password )}}
+  key: {{ .Values.sdc.key }}
+  endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
+vnfmadapter:
+  endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
+etsi-catalog-manager:
+  vnfpkgm:
+  {{- if .Values.global.msbEnabled }}
+    endpoint: https://msb-iag:443/api/vnfpkgm/v1
+  http:
+    client:
+      ssl:
+        trust-store: ${TRUSTSTORE}
+        trust-store-password: ${TRUSTSTORE_PASSWORD}
+  {{- else }}
+    endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
+  {{- end }}