X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=d8e5f0d6971a89f67bf7469089138ca064cd5c02;hb=cde4a784a593555c17146635dcc25013872cabc5;hp=e2b7341b7c1836e8fb9dd6f2905a9a128878eef7;hpb=ae76d2e31d845728ad34ea599a2254b77fd87132;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index e2b7341b7c..d8e5f0d697 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -19,12 +19,26 @@
 global:
   nodePortPrefix: 302
   mariadbGalera: &mariadbGalera
-    #This flag allows SO to instantiate its own mariadb-galera cluster
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
+    #This flag allows NBI 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
+    globalCluster: true
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
   msbEnabled: false
+  # Docker Repository used by RepositoryGenerator
+  dockerHubRepository: docker.io
+  # Additions for MongoDB****************************
+  # If dockerHubRepository is changes the following entry needs
+  # to be changed as well
+  imageRegistry: docker.io
+  imagePullSecrets:
+    - '{{ include "common.names.namespace" . }}-docker-registry-key'
+  # *************************************************
 
 #################################################################
 # Secrets metaconfig
@@ -60,12 +74,13 @@ config:
   openStackRegion: RegionOne
   openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
   db:
-    userName: rene
+    userName: &dbuser rene
     # userPassword: password
     # userCredentialsExternalSecret: some-secret
 
 mariadb-galera:
   db:
+    user: *dbuser
     externalSecret: *dbUserSecretName
     name: &mysqlDbName nbi
   service:
@@ -74,6 +89,9 @@ mariadb-galera:
     internalPort: 3306
   nameOverride: &nbi-galera nbi-galera
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   persistence:
     enabled: true
     mountSubPath: nbi/maria/data
@@ -85,20 +103,28 @@ mariadb-init:
     userCredentialsExternalSecret: *dbUserSecretName
     mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
+  serviceAccount:
+    nameOverride: nbi-config
 
-mongo:
+mongodb:
   nameOverride: nbi-mongo
   config:
-    dbName: ServiceOrderDB
+    dbName: &mongoDBName ServiceOrderDB
+  auth:
+    enabled: false
+    databases:
+    - *mongoDBName
+    usernames:
+    - "nbi"
   service:
-    name: nbi-mongohost
+    nameOverride: nbi-mongohost
     internalPort: 27017
-  nfsprovisionerPrefix: nbi
-  sdnctlPrefix: nbi
-  persistence:
-    mountSubPath: nbi/mongo/data
-    enabled: true
-  disableNfsProvisioner: true
+  #nfsprovisionerPrefix: nbi
+  #sdnctlPrefix: nbi
+  #persistence:
+  #  mountSubPath: nbi/mongo/data
+  #  enabled: true
+  #disableNfsProvisioner: true
 
 
 # default number of instances
@@ -146,18 +172,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 2Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 100m
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 200m
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account