Merge "[COMMON] Add missing .helmignore files and "components/" entries"

[oom.git] / kubernetes / oof / components / oof-cmso / values.yaml

diff --git a/kubernetes/oof/components/oof-cmso/values.yaml b/kubernetes/oof/components/oof-cmso/values.yaml
index c574a86..15aac51 100644 (file)
--- a/kubernetes/oof/components/oof-cmso/values.yaml
+++ b/kubernetes/oof/components/oof-cmso/values.yaml
@@ -13,6 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  commonConfigPrefix: "oof-cmso"
+  truststoreFile: "truststoreONAPall.jks"
+  keystoreFile: "org.onap.oof.jks"
+  truststorePassword:
+  authentication: aaf-auth
+  mariadbGalera: &mariadbGalera
+    #This flag allows OOF-CMSO to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -36,8 +49,13 @@ secrets:
     login: '{{ .Values.config.db.optimizer.userName }}'
     password: '{{ .Values.config.db.optimizer.userPassword }}'
     passwordPolicy: generate
+  - uid: cmso-aaf-creds
+    name: &aafCreds '{{ include "common.release" . }}-cmso-aaf-creds'
+    type: basicAuth
+    login: '{{ .Values.config.aaf.user }}'
+    password: '{{ .Values.config.aaf.password }}'
 
-mariadb-galera:
+mariadb-galera: &localMariadb
   replicaCount: 1
   nameOverride: &dbName cmso-db
   nfsprovisionerPrefix: cmso
@@ -51,19 +69,7 @@ mariadb-galera:
   serviceAccount:
     nameOverride: *dbName
 
-global:
-  commonConfigPrefix: "oof-cmso"
-  truststoreFile: "truststoreONAPall.jks"
-  keystoreFile: "org.onap.oof.jks"
-  truststorePassword:
-  authentication: aaf-auth
-
 mariadb-init:
-  mariadbGalera:
-    containerName: *dbName
-    serviceName: *dbName
-    servicePort: 3306
-    userRootSecret: *rootPassword
   config:
     userCredentialsExternalSecret: *serviceDbCreds
     mysqlDatabase: cmso
@@ -75,6 +81,9 @@ mariadb-init:
 flavor: small
 
 config:
+  aaf:
+    user: oof@oof.onap.org
+    password: demo123456!
   log:
     logstashServiceName: log-ls
     logstashPort: 5044
@@ -109,25 +118,27 @@ oof-cmso-service:
   certInitializer:
     << : *certInitConfig
     nameOverride: oof-cmso-service-cert-initializer
+  mariadb-galera: *localMariadb
   config:
     db:
       userCredentialsExternalSecret: *serviceDbCreds
-      host: *dbName
-      container: *dbName
       mysqlDatabase: cmso
+    aaf:
+      userCredentialsExternalSecret: *aafCreds
 
 oof-cmso-optimizer:
   enabled: true
   certInitializer:
     << : *certInitConfig
     nameOverride: oof-cmso-optimizer-cert-initializer
+  mariadb-galera: *localMariadb
   config:
     enabled: true
     db:
       userCredentialsExternalSecret: *optimizerDbCreds
-      host: *dbName
-      container: *dbName
       mysqlDatabase: optimizer
+    aaf:
+      userCredentialsExternalSecret: *aafCreds
 
 oof-cmso-topology:
   enabled: true