X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=5a0b2a0c07fb1c9f58c5e84cd686840b885f8963;hb=4753743f0743a6b22f69e718c3cdb4ba8843cea6;hp=9b69a4356fa3267b7dd2dc7f73fdb8644819751a;hpb=c1aa68b0c1183d90e6ada524d7e16dabf51bf890;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 9b69a4356f..5a0b2a0c07 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -19,35 +19,17 @@
 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
-
-#################################################################
-# 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
 
 #################################################################
 # Secrets metaconfig
@@ -83,12 +65,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:
@@ -97,6 +80,9 @@ mariadb-galera:
     internalPort: 3306
   nameOverride: &nbi-galera nbi-galera
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   persistence:
     enabled: true
     mountSubPath: nbi/maria/data
@@ -108,6 +94,8 @@ mariadb-init:
     userCredentialsExternalSecret: *dbUserSecretName
     mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
+  serviceAccount:
+    nameOverride: nbi-config
 
 mongo:
   nameOverride: nbi-mongo
@@ -134,7 +122,6 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 180
   periodSeconds: 30
   # necessary to disable liveness probe when setting breakpoints
@@ -143,7 +130,6 @@ liveness:
 
 readiness:
   path: /nbi/api/v4/status
-  port: 8443
   initialDelaySeconds: 185
   periodSeconds: 30
 
@@ -151,15 +137,18 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  nodePort: 74
-  internalPort: 8443
+  internalPort: 8080
+  ports:
+    - name: http
+      port: 8080
+      nodePort: '74'
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "nbi.api"
+    - baseaddr: "nbi-api"
       name: "nbi"
-      port: 8443
+      port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
@@ -168,18 +157,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