From 33f8367b6506bf1df00be1caecfad3dfc69d00ab Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 1 Jun 2018 14:28:39 +0200 Subject: Fix bad values for configuring NBI. PS-3 MK: the sample value for openStackVNFTenantId is being interpolated as a number because it is all numeric. Going with the quoting it at the template level. Changing the value to 12345abcde probably would work too. Change-Id: I2f81430e56f465543d3701a2d8cd4b562e7e987d Issue-ID: OOM-1116 Signed-off-by: Sylvain Desbureaux Signed-off-by: Mandeep Khinda --- kubernetes/nbi/templates/deployment.yaml | 2 +- kubernetes/nbi/values.yaml | 2 +- kubernetes/onap/values.yaml | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) 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: -- cgit 1.2.3-korg