From 5cb046487794d439b9a91178ce3a5939c48da5ed Mon Sep 17 00:00:00 2001 From: Yang Xu Date: Mon, 11 Sep 2017 16:02:50 -0400 Subject: [PATCH] Automatically Set Tenant In Robot VM Issue-Id: INT-192 Change-Id: I46fa28a4d05a45448eaf644a53c33094655ae12b Signed-off-by: Yang Xu --- heat/ONAP/onap_openstack.yaml | 2 ++ heat/ONAP/onap_openstack_nofloat.yaml | 2 ++ heat/ONAP/onap_rackspace.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index af8ef76d..44737be9 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -807,6 +807,7 @@ resources: __network_name__: { get_attr: [oam_onap, name] } __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } @@ -841,6 +842,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 3dbea8e9..fe860d32 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -757,6 +757,7 @@ resources: __network_name__: { get_attr: [oam_onap, name] } __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __robot_ip_addr__: { get_param: robot_ip_addr } @@ -793,6 +794,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__robot_ip_addr__" > /opt/config/local_ip_addr.txt diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index 09c290e4..01f791fe 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -589,6 +589,7 @@ resources: __openstack_username__: { get_param: openstack_username } __openstack_api_key__: { get_param : openstack_api_key } __openstack_password__: { get_param: openstack_password } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __docker_version__: { get_param: docker_version } @@ -608,6 +609,7 @@ resources: echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_password__" > /opt/config/openstack_password.txt echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt -- 2.16.6