summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-01-21 08:17:31 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-21 08:17:31 +0000
commite50e1b827a497d304db800fd3c5a1e18de1afdce (patch)
tree93311555c25c936f777f5ce71ba6def212889ac4 /kubernetes
parent98611159fca5232391c770df340c96dce0f474b0 (diff)
parentc5e14bbb5d7825a8abb8ee279f8e4ce59452c90b (diff)
Merge "Update SO-VNFM-Adapter override.yaml for ETSI"
Diffstat (limited to 'kubernetes')
-rwxr-xr-xkubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml8
-rwxr-xr-xkubernetes/so/values.yaml3
2 files changed, 10 insertions, 1 deletions
diff --git a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
index 760fa16e75..5213700df0 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -49,3 +49,11 @@ sdc:
endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
vnfmadapter:
endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
+etsi-catalog-manager:
+ vnfpkgm:
+ {{- if .Values.global.msbEnabled }}
+ endpoint: http://msb-iag.{{ include "common.namespace" . }}:80/api/vnfpkgm/v1
+ {{- else }}
+ endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api/vnfpkgm/v1
+ {{- end }}
+
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 9d5ff4283e..9af34af88e 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -38,6 +38,7 @@ global:
dbPort: 3306
dbUser: root
dbPassword: secretpassword
+ msbEnabled: true
#################################################################
# Application configuration defaults.
@@ -113,4 +114,4 @@ ingress:
name: "so"
port: 8080
config:
- ssl: "none" \ No newline at end of file
+ ssl: "none"