From: Mike Elliott <mike.elliott@amdocs.com>
Date: Wed, 6 Jun 2018 00:10:11 +0000 (+0000)
Subject: Merge "Sync docker image versions from manifest"
X-Git-Tag: 2.0.0-ONAP~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=51f9d58b96f95d36ba4fed58b309bb8af66d997d;hp=c1add148ff52e78a5cf9305c1cfce136c68e66c2;p=oom.git

Merge "Sync docker image versions from manifest"
---

diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index 06572492fd..57bdf341f2 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -70,7 +70,7 @@ spec:
             - name: ONAP_LCPCLOUDREGIONID
               value: {{ .Values.config.openStackRegion }}
             - name: ONAP_TENANTID
-              value: {{ .Values.config.openStackServiceTenantName }}
+              value: {{ .Values.config.openStackVNFTenantId | quote }}
             - name: ONAP_CLOUDOWNER
               value: {{ .Values.config.cloudOwner }}
             - name: NBI_URL
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 1974f2c25f..68beacdc35 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -41,7 +41,7 @@ config:
   cloudOwner: CloudOwner
   ecompInstanceId: OOM
   openStackRegion: RegionOne
-  openStackServiceTenantName: 31047205ce114b60833b23e400d6a535
+  openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
 
 mariadb:
   nameOverride: nbi-mariadb
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index bcc90fc60c..b8f15e17ea 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -97,11 +97,8 @@ nbi:
   enabled: true
   config:
     # openstack configuration
-    openStackUserName: "vnf_user"
     openStackRegion: "Yolo"
-    openStackKeyStoneUrl: "http://1.2.3.4:5000"
-    openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+    openStackVNFTenantId: "1234"
 policy:
   enabled: true
 portal: