X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmodeling%2Fcomponents%2Fmodeling-etsicatalog%2Fvalues.yaml;h=0aef0f5ce57f2247e75be4e3fa5d226f539f33fe;hb=cfd8434fe9484b9219560159094b174421d6d6a2;hp=c9e24fc07b833471544ad839bdb30ef6cbffeee1;hpb=8cd7c449ac525b357c400a82140d8289a80ec7e8;p=oom.git

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index c9e24fc07b..0aef0f5ce5 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -22,12 +22,17 @@ global:
     mountPath: /dockerdata-nfs
 
   mariadbGalera:
-    #This flag allows Modeling to instantiate its own mariadb-galera cluster
+    #This flag allows SO to instantiate its own mariadb-galera cluster
+    #When changing it to "true", also set "globalCluster: false"
+    #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
-    service: mariadb-galera
+    globalCluster: true
+    service: mariadb-galera-primary
     internalPort: 3306
     nameOverride: mariadb-galera
 
+  centralizedLoggingEnabled: true
+
 readinessCheck:
   wait_for:
     msb:
@@ -65,13 +70,19 @@ mariadb-galera:
   disableNfsProvisioner: true
   serviceAccount:
     nameOverride: *modeling-db
+  replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
 
 mariadb-init:
   config:
     userCredentialsExternalSecret: *dbSecretName
     mysqlDatabase: *mysqlDbName
   # nameOverride should be the same with common.name
-  nameOverride: modeling-etsicatalog
+  nameOverride: etsicatalog-db
+  serviceAccount:
+    nameOverride: etsicatalog-db
 
 #################################################################
 # Application configuration defaults.
@@ -80,14 +91,16 @@ config:
   #application configuration about  msb
   ssl_enabled: false
   msb_enabled: false
-  msbProtocol: https
+  msbProtocol: http
   msbServiceName: msb-iag
   msbPort: 443
-  sdcProtocol: https
+  msbPlainPort: 80
+  sdcProtocol: http
   sdcServiceName: sdc-be
   sdcPort: 8443
+  sdcPlainPort: 8080
   dmaap_enabled: false
-  dmaapProtocol: https
+  dmaapProtocol: http
   dmaapServiceName: message-router-external
   dmaapPort: 3905
 
@@ -100,7 +113,7 @@ config:
 # application image
 flavor: small
 
-image: onap/modeling/etsicatalog:1.0.10
+image: onap/modeling/etsicatalog:1.0.14
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -152,7 +165,7 @@ persistence:
 service:
   type: ClusterIP
   name: modeling-etsicatalog
-  portName: modeling-etsicatalog
+  portName: http
   externalPort: 8806
   internalPort: 8806
 #  nodePort: 30806
@@ -177,3 +190,13 @@ resources:
       cpu: 200m
       memory: 500Mi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: modeling-etsicatalog
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap