X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=0d143dc6c6d1839b09332d01f688151550671bbd;hb=refs%2Fheads%2Fmaster;hp=dc323675adf51660f6398c73deb3050e16203868;hpb=0a7981b8125990b667aa0814b2a65c976fa0f6d6;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index dc323675ad..0d143dc6c6 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -19,36 +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
-  aafEnabled: true
-  msbEnabled: true
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: nbi-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: nbi
-  fqi: nbi@nbi.onap.org
-  public_fqdn: nbi.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: >
-    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
-    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
-
-aafConfig:
-  permission_user: 1000
-  permission_group: 999
+  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
@@ -84,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:
@@ -98,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
@@ -109,21 +103,29 @@ 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
-
+  resources:
+    limits:
+      cpu: "1"
+      memory: "1Gi"
+    requests:
+      cpu: "500m"
+      memory: "1Gi"
 
 # default number of instances
 replicaCount: 1
@@ -150,12 +152,10 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  internalPort: 8443
-  internalPlainPort: 8080
+  internalPort: 8080
   ports:
     - name: http
-      port: 8443
-      plain_port: 8080
+      port: 8080
       nodePort: '74'
 
 ingress:
@@ -163,8 +163,7 @@ ingress:
   service:
     - baseaddr: "nbi-api"
       name: "nbi"
-      port: 8443
-      plain_port: 8080
+      port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
@@ -173,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