[EXTAPI] Make new nbi properties configurable in oom

Added two k8s related properties in nbi:
1. k8sCloudRegionId
2. k8sCloudOwner

To support CNF instantiation through SO macro flow,
we need to add k8s related configurations.

Issue-ID: EXTAPI-524
Signed-off-by: aleemraja <ar00500721@techmahindra.com>
Change-Id: I970ec5fe4fe707d8fb5fba6e96969c2baf496969

diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index febb8a9..6d5b2d5 100644 (file)
--- 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 0f3fd1a..58fa336 100644 (file)
--- 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