summaryrefslogtreecommitdiffstats
path: root/heat/ONAP/onap_openstack.env
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-10-31 01:55:41 -0400
committerLusheng Ji <lji@research.att.com>2017-10-31 14:23:06 +0000
commitb810810e3c4c7470163a8964aff6a67a762be448 (patch)
tree1cac47eab5c4f6b642a09eb8bc2c89b836ffa22d /heat/ONAP/onap_openstack.env
parent25137730b55170e41e0304d5c9580487572f3275 (diff)
Add fix for separating name from ID
MultiCould expects tenant name and network name instead of IDs. Integration Heat passes in only IDs. Added additional parameters for names. Fix a file path issue when setting up nginx. Issue-Id: DCAEGEN2-128 Change-Id: Iac6025c4ab1f38682c8f75d13c6ea6b31d43106a Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'heat/ONAP/onap_openstack.env')
-rw-r--r--heat/ONAP/onap_openstack.env8
1 files changed, 6 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index aad2d1e1..ba8ffd34 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -6,7 +6,9 @@ parameters:
# #
##############################################
- public_net_id: PUT YOUR NETWORK ID/NAME HERE
+ public_net_id: PUT YOUR NETWORK ID HERE
+
+ public_net_name: PUT YOUR NETWORK NAME HERE
ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
@@ -42,6 +44,8 @@ parameters:
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
+ openstack_tenant_name: PUT YOUR OPENSTACK PROJECT NAME HERE
+
openstack_username: PUT YOUR OPENSTACK USERNAME HERE
openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
@@ -118,8 +122,8 @@ parameters:
dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
- dnsaas_tenant_id: PUT THE DESIGNATE PROVIDING OPENSTACK'S DEFAULT TENANT HERE
dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
+ dnsaas_tenant_name: PUT THE TENANT NAME IN THE DESIGNATE PROVIDING OPENSTACK HERE
dnsaas_username: PUT THE DESIGNATE PROVIDING OPENSTACK'S USERNAME HERE
dnsaas_password: PUT THE DESIGNATE PROVIDING OPENSTACK'S PASSWORD HERE
dcae_keystone_url: PUT THE MULTIVIM PROVIDED KEYSTONE API URL HERE