porting robot tenantId change

This change to robot caused demo init stop working in OOM
as we were using tenantName to keystone auth.

https://gerrit.onap.org/r/#/c/11539/

This fixes the issue and requires a new parameter to
onap-parameters.yaml.

steps to workaround will be provided in the jira comments

Issue-ID: INT-149

Change-Id: I3dad07b24313a5bc6637b602a8c52835544155e8
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index b97eee0..a28be64 100755 (executable)
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -7,6 +7,7 @@ echo "Validating onap-parameters.yaml has been populated"
 [[ -z "$OPENSTACK_OAM_SUBNET_ID" ]] && { echo "Error: OPENSTACK_OAM_SUBNET_ID must be set in onap-parameters.yaml"; exit 1; }
 [[ -z "$OPENSTACK_OAM_NETWORK_CIDR" ]] && { echo "Error: OPENSTACK_OAM_NETWORK_CIDR must be set in onap-parameters.yaml"; exit 1; }
 [[ -z "$OPENSTACK_USERNAME" ]] && { echo "Error: OPENSTACK_USERNAME must be set in onap-parameters.yaml"; exit 1; }
+[[ -z "$OPENSTACK_TENANT_ID" ]] && { echo "Error: OPENSTACK_TENANT_ID must be set in onap-parameters.yaml"; exit 1; }
 [[ -z "$OPENSTACK_API_KEY" ]] && { echo "Error: OPENSTACK_API_KEY must be set in onap-parameters.yaml"; exit 1; }
 [[ -z "$OPENSTACK_REGION" ]] && { echo "Error: OPENSTACK_REGION must be set in onap-parameters.yaml"; exit 1; }
 [[ -z "$OPENSTACK_KEYSTONE_URL" ]] && { echo "Error: OPENSTACK_KEYSTONE_URL must be set in onap-parameters.yaml"; exit 1; }
@@ -84,6 +85,8 @@ find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s,NETWORK_CIDR_WITH_ONAP_
 
 find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_USERNAME_HERE/$OPENSTACK_USERNAME/g" {} \;
 
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_TENANT_ID_HERE/$OPENSTACK_TENANT_ID/g" {} \;
+
 find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_PASSWORD_HERE/$OPENSTACK_API_KEY/g" {} \;
 
 find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_REGION_HERE/$OPENSTACK_REGION/g" {} \;

diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
index bc9d07c..d0ef256 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
@@ -12,12 +12,13 @@ GLOBAL_INJECTED_GERRIT_BRANCH = "master"
 GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE"
 GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router"
 GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso"
-GLOBAL_INJECTED_NETWORK = "OPENSTACK_OAM_NETWORK_ID_HERE"
+GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE"
 GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001"
 GLOBAL_INJECTED_NEXUS_PASSWORD = "docker"
 GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw"
 GLOBAL_INJECTED_NEXUS_USERNAME = "docker"
 GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE"
+GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE"
 GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE"
 GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy"
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy"

diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml
index 3a74bed..081bc9d 100644 (file)
--- a/kubernetes/config/onap-parameters-sample.yaml
+++ b/kubernetes/config/onap-parameters-sample.yaml
@@ -6,6 +6,7 @@ OPENSTACK_OAM_NETWORK_CIDR: "192.168.30.0/24"
 OPENSTACK_USERNAME: "vnf_user"
 OPENSTACK_API_KEY: "vnf_password"
 OPENSTACK_TENANT_NAME: "vnfs"
+OPENSTACK_TENANT_ID: "47899782ed714295b1151681fdfd51f5"
 OPENSTACK_REGION: "RegionOne"
 OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000"
 OPENSTACK_FLAVOUR_MEDIUM: "m1.medium"

diff --git a/kubernetes/config/onap-parameters.yaml b/kubernetes/config/onap-parameters.yaml
index 7ddaf4d..6f84d0f 100644 (file)
--- a/kubernetes/config/onap-parameters.yaml
+++ b/kubernetes/config/onap-parameters.yaml
@@ -6,6 +6,7 @@ OPENSTACK_OAM_NETWORK_CIDR: ""
 OPENSTACK_USERNAME: ""
 OPENSTACK_API_KEY: ""
 OPENSTACK_TENANT_NAME: ""
+OPENSTACK_TENANT_ID: ""
 OPENSTACK_REGION: ""
 OPENSTACK_KEYSTONE_URL: ""
 OPENSTACK_FLAVOUR_MEDIUM: ""