X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-vnfm-adapter%2Fvalues.yaml;fp=kubernetes%2Fso%2Fcharts%2Fso-vnfm-adapter%2Fvalues.yaml;h=f15fffb0550ac53eff55cbaccf83d7b30c0e058f;hb=0df1f8ec5332651b5ce2731dd25ee2319f393b4f;hp=8580df2bf931269f55083b87933813b347b44be0;hpb=7ba9cb9f6e9dd62210d42eb19e693293bab52042;p=oom.git

diff --git a/kubernetes/so/charts/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-vnfm-adapter/values.yaml
similarity index 67%
rename from kubernetes/so/charts/so-vnfm-adapter/values.yaml
rename to kubernetes/so/components/so-vnfm-adapter/values.yaml
index 8580df2bf9..f15fffb055 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/values.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2019 Nordix Foundation
-#
+# Copyright © 2020 Huawei
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -18,22 +18,16 @@ global:
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
   readinessImage: onap/oom/readiness:3.0.1
+  aafAgentImage: onap/aaf/aaf_agent:2.1.20
+  envsubstImage: dibi/envsubst
   persistence:
     mountPath: /dockerdata-nfs
-
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
-  - uid: "so-onap-certs"
-    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
-    type: generic
-    filePaths: '{{ .Values.secretsFilePaths }}'
-
-#secretsFilePaths: |
-#  - 'my file 1'
-#  - '{{ include "templateThatGeneratesFileName" . }}'
-
+  security:
+    aaf:
+      enabled: false
+  aaf:
+    auth:
+      header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo=
 
 #################################################################
 # Application configuration defaults.
@@ -42,21 +36,47 @@ repository: nexus3.onap.org:10001
 image: onap/so/vnfm-adapter:1.6.4
 pullPolicy: Always
 
+aaf:
+  auth:
+    username: so@so.onap.org
+    password: 8DB1C939BFC6A35C3832D0E52E452D0E05AE2537AF142CECD125FF827C05A972FDD0F4700547DA
+aai:
+  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
+mso:
+  key: 07a7159d3bf51a0e53be7a8f89699be7
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+
 replicaCount: 1
 minReadySeconds: 10
-containerPort: 9092
+containerPort: &containerPort 9092
 logPath: ./logs/vnfm-adapter/
 app: vnfm-adapter
 service:
     type: NodePort
-    internalPort: 9092
-    externalPort: 9092
+    internalPort: *containerPort
+    externalPort: *containerPort
     nodePort: "06"
     portName: so-vnfm-port
 updateStrategy:
     type: RollingUpdate
     maxUnavailable: 1
     maxSurge: 1
+
+#################################################################
+# soHelpers part
+#################################################################
+soHelpers:
+  nameOverride: so-vnfm-cert-init
+  certInitializer:
+    nameOverride: so-vnfm-cert-init
+    credsPath: /opt/app/osaaf/local
+  cadi:
+    apiEnforcement: org.onap.so.vnfmAdapterPerm
+  containerPort: *containerPort
+
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)