From b810810e3c4c7470163a8964aff6a67a762be448 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Tue, 31 Oct 2017 01:55:41 -0400 Subject: 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 --- heat/ONAP/onap_openstack.env | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'heat/ONAP/onap_openstack.env') 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 -- cgit 1.2.3-korg