Merge "[SO-ETSI-NFVO] Add SO DB and NFVO DB Credentials to NFVO NS LCM Pod for DB...

diff --combined kubernetes/so/values.yaml
index 0d3b392,e834d86..0a9dbf4
--- 1/kubernetes/so/values.yaml
--- 2/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -26,7 -26,7 +26,7 @@@ global
    mariadbGalera:
      nameOverride: mariadb-galera
      serviceName: mariadb-galera
-     servicePort: "3306"
+     servicePort: '3306'
      # mariadbRootPassword: secretpassword
      # rootPasswordExternalSecret: some secret
      #This flag allows SO to instantiate its own mariadb-galera cluster,
@@@ -87,7 -87,7 +87,7 @@@ secrets
      passwordPolicy: required
      annotations:
        helm.sh/hook: pre-upgrade,pre-install
-       helm.sh/hook-weight: "0"
+       helm.sh/hook-weight: '0'
        helm.sh/hook-delete-policy: before-hook-creation
    - uid: db-user-creds
      name: &dbUserCredsSecretName '{{ include "common.release" . }}-so-db-user-creds'
@@@ -103,22 -103,12 +103,22 @@@
      login: '{{ .Values.dbCreds.adminName }}'
      password: '{{ .Values.dbCreds.adminPassword }}'
      passwordPolicy: generate
-   - uid: "so-onap-certs"
+   - uid: 'so-onap-certs'
      name: &so-certs '{{ include "common.release" . }}-so-certs'
      externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
      type: generic
      filePaths:
        - resources/config/certificates/msb-ca.crt
 +  - uid: "mso-key"
 +    name: &mso-key '{{ include "common.release" . }}-mso-key'
 +    type: password
 +    password: '{{ .Values.global.app.msoKey }}'
 +  - uid: mso-oof-auth
 +    name: &mso-oof-auth '{{ include "common.release" . }}-mso-oof-auth'
 +    type: basicAuth
 +    login: '{{ .Values.mso.oof.login }}'
 +    password: '{{ .Values.mso.oof.password }}'
 +    passwordPolicy: required
  
  aafConfig:
    permission_user: 1000
@@@ -219,11 -209,11 +219,11 @@@ mariadb-galera
  ingress:
    enabled: false
    service:
-     - baseaddr: "so.api"
-       name: "so"
+     - baseaddr: 'so.api'
+       name: 'so'
        port: 8080
    config:
-     ssl: "none"
+     ssl: 'none'
  
  mso:
    adapters:
@@@ -235,9 -225,6 +235,9 @@@
        auth: 878785F4F31BC9CFA5AB52A172008212D8845ED2DE08AD5E56AF114720A4E49768B8F95CDA2EB971765D28EDCDAA24
    aai:
      auth: 6E081E10B1CA43A843E303733A74D9B23B601A6E22A21C7EF2C7F15A42F81A1A4E85E65268C2661F71321052C7F3E55B96A8E1E951F8BF6F
 +  oof:
 +    login: test
 +    password: testpwd
    so:
      operationalEnv:
        dmaap:
@@@ -261,6 -248,8 +261,8 @@@ so-catalog-db-adapter
  
  so-etsi-nfvo-ns-lcm:
    enabled: true
+   db:
+     <<: *dbSecrets
  
  so-monitoring:
    enabled: true
@@@ -298,16 -287,6 +300,16 @@@ so-nssmf-adapter
    db:
      <<: *dbSecrets
  
 +so-oof-adapter:
 +  enabled: true
 +  db:
 +    <<: *dbSecrets
 +  mso:
 +    msoKeySecret: *mso-key
 +    camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
 +    oof:
 +      authSecret: *mso-oof-auth
 +
  so-vnfm-adapter:
    enabled: true