[SDNC] Provide hardcoded aaiclient.properties file via helm

[oom.git] / kubernetes / sdnc / values.yaml

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 8ef043a..99ff4b7 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -1,3 +1,4 @@
+# Copyright © 2020 Samsung Electronics
 # Copyright © 2017 Amdocs, Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,8 +44,15 @@ secrets:
   - uid: db-root-password
     name: '{{ include "common.release" . }}-sdnc-db-root-password'
     type: password
-    externalSecret: '{{ .Values.global.mariadbGalera.localCluster | ternary (default (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" (index .Values "mariadb-galera" "nameOverride"))) (index .Values "mariadb-galera" "config" "mariadbRootPasswordExternalSecret")) (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
-    password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword" }}'
+    externalSecret: '{{ .Values.global.mariadbGalera.localCluster |
+      ternary (default (include "common.mariadb.secret.rootPassSecretName"
+      (dict "dot" . "chartName"
+      (index .Values "mariadb-galera" "nameOverride")))
+      (index .Values "mariadb-galera" "config"
+      "mariadbRootPasswordExternalSecret"))
+      (include "common.mariadb.secret.rootPassSecretName"
+      (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
+    password: '{{ (index .Values "mariadb-galera" "config" "mariadbRootPassword") }}'
   - uid: db-secret
     name: &dbSecretName '{{ include "common.release" . }}-sdnc-db-secret'
     type: basicAuth
@@ -110,7 +118,7 @@ secrets:
 # application images
 repository: nexus3.onap.org:10001
 pullPolicy: Always
-image: onap/sdnc-image:1.7.6
+image: onap/sdnc-image:1.8.0
 
 
 # flag to enable debugging - application support required
@@ -152,6 +160,7 @@ config:
   peerODLCluster: 127.0.0.1
   isPrimaryCluster: true
   configDir: /opt/onap/sdnc/data/properties
+  ccsdkConfigDir: /opt/onap/ccsdk/data/properties
   dmaapTopic: SUCCESS
   dmaapPort: 3904
   logstashServiceName: log-ls
@@ -198,7 +207,7 @@ aaf_init:
 
 mariadb-galera: &mariadbGalera
   nameOverride: sdnc-db
-  config:
+  config: &mariadbGaleraConfig
     rootPasswordExternalSecret: '{{ ternary (include "common.release" .)-sdnc-db-root-password "" .Values.global.mariadbGalera.localCluster }}'
     userName: sdnctl
     userCredentialsExternalSecret: *dbSecretName
@@ -217,8 +226,9 @@ cds:
 dmaap-listener:
   nameOverride: sdnc-dmaap-listener
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -229,8 +239,9 @@ dmaap-listener:
 
 ueb-listener:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   nameOverride: sdnc-ueb-listener
   config:
@@ -241,8 +252,9 @@ ueb-listener:
 
 sdnc-portal:
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: *sdncDbName
   config:
     sdncChartName: sdnc
@@ -253,8 +265,9 @@ sdnc-ansible-server:
   config:
     restCredsExternalSecret: *ansibleSecretName
   mariadb-galera:
-    << : *mariadbGalera
+    <<: *mariadbGalera
     config:
+      <<: *mariadbGaleraConfig
       mysqlDatabase: ansible
   service:
     name: sdnc-ansible-server