X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvfc%2Fvalues.yaml;h=a0b69e0c94183f3f03e1479e2028366c3772d86b;hb=refs%2Fheads%2Fmaster;hp=19197c7f76a4a3735ae41be1b78ad88919e3b9a2;hpb=49e9a3a7886f294fd0d78586f0a1dc1b27d3230c;p=oom.git

diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 19197c7f76..05b7eb1fa3 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -15,7 +15,7 @@
 global:
   config:
     ssl_enabled: false
-    msbprotocol: https
+    msbprotocol: http
     msbServiceName: msb-iag
     msbPort: 443
     redisServiceName: vfc-redis
@@ -26,69 +26,87 @@ global:
 # we use this flag to determine who is responbile for serice registeration
 # and it can reduce duplicate registration.
     reg_to_msb_when_start: False
-    mariadb_admin: root
+    mariadb_admin: &mariadbAdmin root
   persistence:
     mountPath: /dockerdata-nfs
+  mariadbGalera: &mariadbGalera
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
+    #This flag allows VFC to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 secrets:
-  - uid: "db-root-pass"
+  - uid: db-root-pass
     name: &dbRootPassSecret '{{ include "common.release" . }}-vfc-db-root-pass'
+    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .) (hasSuffix "db-root-pass" (index .Values "mariadb-galera" "rootUser" "externalSecret"))}}'
+    login: '{{ index .Values "mariadb-galera" "rootUser" "user"  }}'
+    password: '{{ index .Values "mariadb-galera" "rootUser" "password"  }}'
     type: password
-    password: '{{ .Values.config.mariadbRootPassword }}'
 
 # application configuration
 config:
   logstashServiceName: log-ls
   logstashPort: 5044
 
-mariadb-galera:
+mariadb-galera: &localMariadb
   rootUser:
+    user: *mariadbAdmin
+  # password:
     externalSecret: *dbRootPassSecret
-  nameOverride: &vfc-mariadb vfc-mariadb
+  nameOverride: &dbServer vfc-mariadb
+  service:
+    name: *dbServer
+    portName: *dbServer
+    internalPort: 3306
   nfsprovisionerPrefix: vfc
   persistence:
     mountSubPath: vfc/data
     enabled: true
   disableNfsProvisioner: true
   serviceAccount:
-    nameOverride: *vfc-mariadb
-
-db: &dbConfig
-  mariadbService: vfc-mariadb
-  mariadbPort: 3306
-  mariadbRootPasswordExternalSecret: *dbRootPassSecret
+    nameOverride: *dbServer
+  replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
 
 vfc-generic-vnfm-driver:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 vfc-huawei-vnfm-driver:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 vfc-nslcm:
   enabled: true
-  config:
-    << : *dbConfig
+  mariadb-galera: *localMariadb
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 vfc-redis:
   enabled: true
 
 vfc-vnflcm:
   enabled: true
-  config:
-    << : *dbConfig
+  mariadb-galera: *localMariadb
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 vfc-vnfmgr:
   enabled: true
-  config:
-    << : *dbConfig
+  mariadb-galera: *localMariadb
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 vfc-vnfres:
   enabled: true
-  config:
-    << : *dbConfig
+  mariadb-galera: *localMariadb
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'
 
 # sub-chart configuration
 vfc-workflow:
@@ -100,4 +118,5 @@ vfc-workflow-engine:
     workflowPort: 10550
 
 vfc-zte-vnfm-driver:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-vfc'