X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fnbi%2Fvalues.yaml;h=a94bd4df4aca60e7687ad04c96f324ee71deaaab;hb=ad0f69e402aaff1e19a5330f3949d3f445b949b5;hp=1fc1600374c5ff97a619251c3f4dc2f01ca89669;hpb=0b14ba4a20a879ef6b94ae5db64fa08354d2f648;p=oom.git

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 1fc1600374..a94bd4df4a 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -18,9 +18,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
   mariadbGalera: &mariadbGalera
     #This flag allows SO to instantiate its own mariadb-galera cluster
     localCluster: false
@@ -28,8 +25,6 @@ global:
     internalPort: 3306
     nameOverride: mariadb-galera
   aafEnabled: true
-  busyBoxImage: busybox:1.30
-  busyBoxRepository: docker.io
 
 #################################################################
 # AAF part
@@ -47,9 +42,8 @@ certInitializer:
   app_ns: org.osaaf.aaf
   credsPath: /opt/app/osaaf/local
   aaf_add_config: >
-    /opt/app/aaf_config/bin/agent.sh;
-    /opt/app/aaf_config/bin/agent.sh local showpass
-    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
+    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
@@ -60,7 +54,7 @@ aafConfig:
 #################################################################
 secrets:
   - uid: nbi-db-secret
-    name: '{{ include "common.release" . }}-nbi-db-secret'
+    name: &dbUserSecretName '{{ include "common.release" . }}-nbi-db-secret'
     type: basicAuth
     externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
     login: '{{ .Values.config.db.userName }}'
@@ -71,7 +65,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/externalapi/nbi:7.0.0
+image: onap/externalapi/nbi:8.0.1
 pullPolicy: IfNotPresent
 sdc_authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
 aai_authorization: Basic QUFJOkFBSQ==
@@ -83,6 +77,8 @@ config:
   logstashServiceName: log-ls
   logstashPort: 5044
   cloudOwner: CloudOwner
+  k8sCloudRegionId: k8sregionfour
+  k8sCloudOwner: k8scloudowner4
   ecompInstanceId: OOM
   openStackRegion: RegionOne
   openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
@@ -92,23 +88,21 @@ config:
     # userCredentialsExternalSecret: some-secret
 
 mariadb-galera:
-  # '&mariadbConfig' means we "store" the values for  later use in the file
-  # with '*mariadbConfig' pointer.
-  config: &mariadbConfig
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-nbi-db-secret'
-    mysqlDatabase: nbi
-  nameOverride: nbi-galera
-  service:
-    name: nbi-galera
-    portName: nbi-galera
-    internalPort: 3306
+  db:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName nbi
+  nameOverride: &nbi-galera nbi-galera
   replicaCount: 1
   persistence:
     enabled: true
     mountSubPath: nbi/maria/data
+  serviceAccount:
+    nameOverride: *nbi-galera
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
 
 mongo: