summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-10-19 06:47:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-19 06:47:12 +0000
commit378813a42e27b1bc7a5e469641b7e4c47ffad43e (patch)
treef1249788649f8f8fe3005d04797a9b3e42f9e80e
parent842d775b0d37e9f33c798a6b72135832473ab0d2 (diff)
parent40149d835b9ee6bc12ec113ea1ef65bfd9ee8b85 (diff)
Merge "[EXTAPI] Make new nbi properties configurable in oom"
-rw-r--r--kubernetes/nbi/templates/deployment.yaml4
-rw-r--r--kubernetes/nbi/values.yaml2
2 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index febb8a9624..6d5b2d508f 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -100,6 +100,10 @@ spec:
value: {{ .Values.config.openStackVNFTenantId | quote }}
- name: ONAP_CLOUDOWNER
value: {{ .Values.config.cloudOwner }}
+ - name: ONAP_K8SCLOUDREGIONID
+ value: {{ .Values.config.k8sCloudRegionId }}
+ - name: ONAP_K8SCLOUDOWNER
+ value: {{ .Values.config.k8sCloudOwner }}
- name: NBI_URL
value: "https://nbi.{{ include "common.namespace" . }}:8443/nbi/api/v4"
- name: SDC_HOST
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 0f3fd1a352..58fa33611c 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -83,6 +83,8 @@ config:
logstashServiceName: log-ls
logstashPort: 5044
cloudOwner: CloudOwner
+ k8sCloudRegionId: k8sregionfour
+ k8sCloudOwner: k8scloudowner4
ecompInstanceId: OOM
openStackRegion: RegionOne
openStackVNFTenantId: 31047205ce114b60833b23e400d6a535