Merge "[SO] Disable SO-VE-VNFM per default"

diff --combined kubernetes/so/values.yaml
index d47d1fb,8843a7d..be06267
--- 1/kubernetes/so/values.yaml
--- 2/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -60,7 -60,6 +60,7 @@@ global
      siteName: onapheat
      auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
      defaultCloudOwner: onap
 +    msoKey: 07a7159d3bf51a0e53be7a8f89699be7
    client:
      certs:
        truststore: /app/client/org.onap.so.trust.jks
@@@ -115,16 -114,44 +115,16 @@@ secrets
      type: generic
      filePaths:
        - resources/config/certificates/msb-ca.crt
 -  - uid: 'mso-key'
 +  - uid: "mso-key"
      name: &mso-key '{{ include "common.release" . }}-mso-key'
      type: password
 -    password: '{{ .Values.mso.msoKey }}'
 +    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
 -  - uid: server-actuator-creds
 -    name: &actuator-secrets '{{ include "common.release" . }}-so-server-actuator-creds'
 -    type: basicAuth
 -    externalSecret: '{{ tpl (default "" .Values.server.actuatorCredsExternalSecret) . }}'
 -    login: '{{ .Values.server.actuator.username }}'
 -    password: '{{ .Values.server.actuator.password }}'
 -    passwordPolicy: required
 -  - uid: server-bpel-creds
 -    name: &bpel-secrets '{{ include "common.release" . }}-so-server-bpel-creds'
 -    type: basicAuth
 -    externalSecret: '{{ tpl (default "" .Values.server.bpelCredsExternalSecret) . }}'
 -    login: '{{ .Values.server.bpel.username }}'
 -    password: '{{ .Values.server.bpel.password }}'
 -    passwordPolicy: required
 -  - uid: so-aaf-creds
 -    name: &aaf-secrets '{{ include "common.release" . }}-so-server-aaf-creds'
 -    type: basicAuth
 -    externalSecret: '{{ tpl (default "" .Values.server.aafCredsExternalSecret) . }}'
 -    login: '{{ .Values.server.aaf.username }}'
 -    password: '{{ .Values.server.aaf.password }}'
 -    passwordPolicy: required
 -  - uid: so-aai-creds
 -    name: &aai-secrets '{{ include "common.release" . }}-so-server-aai-creds'
 -    type: basicAuth
 -    externalSecret: '{{ tpl (default "" .Values.server.aaiCredsExternalSecret) . }}'
 -    login: '{{ .Values.server.aai.username }}'
 -    password: '{{ .Values.server.aai.password }}'
 -    passwordPolicy: required
  
  aafConfig:
    permission_user: 1000
@@@ -146,20 -173,44 +146,20 @@@ dbCreds
    userName: so_user
    adminName: so_admin
  
 -server:
 -  aaf:
 -    username: so@so.onap.org
 -    password: demo123456
 -  # aafCredsExternalSecret: some secret
 -  aai:
 -    username: aai@aai.onap.org
 -    password: demo123456!
 -  # aaiCredsExternalSecret: some secret
 -  actuator:
 -    username: mso_admin
 -    password: password1$
 -  # actuatorCredsExternalSecret: some secret
 -  bpel:
 -    username: bpel
 -    password: password1$
 -  # bpelCredsExternalSecret: some secret
 -
  repository: nexus3.onap.org:10001
  image: onap/so/api-handler-infra:1.6.4
  pullPolicy: Always
 -
  replicaCount: 1
  minReadySeconds: 10
 -
  containerPort: &containerPort 8080
 -
  logPath: ./logs/apih/
 -
  app: api-handler-infra
 -
  service:
    type: NodePort
    nodePort: 77
    internalPort: *containerPort
    externalPort: *containerPort
    portName: so-apih-port
 -
  updateStrategy:
    type: RollingUpdate
    maxUnavailable: 1
@@@ -236,6 -287,7 +236,6 @@@ mso
      requestDb:
        auth: Basic YnBlbDpwYXNzd29yZDEk
    camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
 -  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
    sdc:
      client:
        auth: 878785F4F31BC9CFA5AB52A172008212D8845ED2DE08AD5E56AF114720A4E49768B8F95CDA2EB971765D28EDCDAA24
@@@ -252,7 -304,9 +252,7 @@@
      auth: basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
  
  so-appc-orchestrator:
 -  enabled: true
 -  server:
 -    actuatorCredsExternalSecret: *actuator-secrets
 +  enabled: false
    db:
      <<: *dbSecrets
  
@@@ -265,16 -319,51 +265,16 @@@ so-catalog-db-adapter
    db:
      <<: *dbSecrets
  
 -so-cnf-adapter:
 -  enabled: true
 -  server:
 -    aafCredsExternalSecret: *aaf-secrets
 -    aaiCredsExternalSecret: *aai-secrets
 -    actuatorCredsExternalSecret: *actuator-secrets
 -  mso:
 -    msoKeySecret: *mso-key
 -
  so-etsi-nfvo-ns-lcm:
    enabled: true
    db:
      <<: *dbSecrets
  
 -so-mariadb:
 -  db:
 -    rootPasswordExternalSecretLocalDb: *dbRootPassSecretName
 -    rootPasswordExternalSecret: '{{ ternary .Values.db.rootPasswordExternalSecretLocalDb (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) .Values.global.mariadbGalera.localCluster }}'
 -    backupCredsExternalSecret: *dbBackupCredsSecretName
 -    userCredsExternalSecret: *dbUserCredsSecretName
 -    adminCredsExternalSecret: *dbAdminCredsSecretName
 -
  so-monitoring:
    enabled: true
    db:
      <<: *dbSecrets
  
 -so-nssmf-adapter:
 -  enabled: true
 -  server:
 -    actuatorCredsExternalSecret: *actuator-secrets
 -    bpelCredsExternalSecret: *bpel-secrets
 -  db:
 -    <<: *dbSecrets
 -
 -so-oof-adapter:
 -  enabled: true
 -  db:
 -    <<: *dbSecrets
 -  mso:
 -    msoKeySecret: *mso-key
 -    camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
 -    oof:
 -      authSecret: *mso-oof-auth
 -
  so-openstack-adapter:
    enabled: true
    db:
@@@ -294,35 -383,12 +294,35 @@@ so-sdnc-adapter
      <<: *dbSecrets
  
  so-ve-vnfm-adapter:
-   enabled: true
+   enabled: false
  
  so-vfc-adapter:
    enabled: true
    db:
      <<: *dbSecrets
  
 +so-nssmf-adapter:
 +  enabled: true
 +  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
 +
 +so-mariadb:
 +  db:
 +    rootPasswordExternalSecretLocalDb: *dbRootPassSecretName
 +    rootPasswordExternalSecret: '{{ ternary .Values.db.rootPasswordExternalSecretLocalDb (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) .Values.global.mariadbGalera.localCluster }}'
 +    backupCredsExternalSecret: *dbBackupCredsSecretName
 +    userCredsExternalSecret: *dbUserCredsSecretName
 +    adminCredsExternalSecret: *dbAdminCredsSecretName