From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 19 Oct 2020 06:55:22 +0000 (+0000)
Subject: Merge "[SO] Add charts for so-oof-adapter"
X-Git-Tag: 7.0.0~122
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9c5531049326e3a445cd06d94ffc1e394bf29a55;hp=-c;p=oom.git

Merge "[SO] Add charts for so-oof-adapter"
---

9c5531049326e3a445cd06d94ffc1e394bf29a55
diff --combined kubernetes/so/requirements.yaml
index d8854ca191,1c0db77cc0..82cf3e927f
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@@ -40,10 -40,6 +40,10 @@@ dependencies
      version: ~6.x-0
      repository: 'file://components/so-db-secrets'
      condition: so-etsi-nfvo-ns-lcm.enabled
 +  - name: so-etsi-nfvo-ns-lcm
 +    version: ~6.x-0
 +    repository: 'file://components/so-etsi-nfvo-ns-lcm'
 +    condition: so-etsi-nfvo-ns-lcm.enabled
    - name: so-mariadb
      version: ~6.x-0
      repository: 'file://components/so-mariadb'
@@@ -55,6 -51,10 +55,10 @@@
      version: ~6.x-0
      repository: 'file://components/so-nssmf-adapter'
      condition: so-nssmf-adapter.enabled
+   - name: so-oof-adapter
+     version: ~6.x-0
+     repository: 'file://components/so-oof-adapter'
+     condition: so-oof-adapter.enabled
    - name: so-openstack-adapter
      version: ~6.x-0
      repository: 'file://components/so-openstack-adapter'
diff --combined kubernetes/so/values.yaml
index 47c82c3d86,d12c0b173d..0d3b3927ec
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -109,6 -109,16 +109,16 @@@ secrets
      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
@@@ -225,6 -235,9 +235,9 @@@ mso
        auth: 878785F4F31BC9CFA5AB52A172008212D8845ED2DE08AD5E56AF114720A4E49768B8F95CDA2EB971765D28EDCDAA24
    aai:
      auth: 6E081E10B1CA43A843E303733A74D9B23B601A6E22A21C7EF2C7F15A42F81A1A4E85E65268C2661F71321052C7F3E55B96A8E1E951F8BF6F
+   oof:
+     login: test
+     password: testpwd
    so:
      operationalEnv:
        dmaap:
@@@ -246,9 -259,6 +259,9 @@@ so-catalog-db-adapter
    db:
      <<: *dbSecrets
  
 +so-etsi-nfvo-ns-lcm:
 +  enabled: true
 +
  so-monitoring:
    enabled: true
    db:
@@@ -285,6 -295,16 +298,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