Support MultiCloud proxyed Designate for DCAE

The Heat template changes, env changes, adn README changes are
for supporting the MutiCloud proxy-ed Designate solution.  This
change works together with change: https://gerrit.onap.org/r/#/c/21199/
which bootstrap DCAE using values provided by this change.

Issue-Id: DCAEGEN2-128
Change-Id: Ib78fafb6ed1d17ed71eac3cbdc199418a7e5fd30
Signed-off-by: Lusheng Ji <lji@research.att.com>

1 files changed, 14 insertions, 18 deletions

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 06c09b9d..09cf505b 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -104,7 +104,7 @@ parameters:
 
 #  dcae_base_environment: 1-NIC-FLOATING-IPS
 
-  dcae_zone: ZONE
+#  dcae_zone: ZONE
 
 #  dcae_state: STATE
 
@@ -115,23 +115,19 @@ parameters:
 #  gitlab_branch: master
 
 #  dcae_code_version: 1.1.0
-
-  dcaeos_cloud_env: PUT DCAE TARGET DEPLOYMENT STACK'S FLAVOR (e.g. openstack) HERE
-  dcaeos_keystone_url: PUT DCAE TARGET DEPLOYMENT STACK'S KEYSTONE URL HERE
-  dcaeos_openstack_region: PUT DCAE TARGET DEPLOYMENT STACK'S REGION HERE
-  dcaeos_openstack_tenant_id: PUT DCAE TARGET DEPLOYMENT STACK'S TENANT ID HERE
-  dcaeos_openstack_username: PUT DCAE TARGET DEPLOYMENT STACK'S USERNAME HERE
-  dcaeos_openstack_password: PUT DCAE TARGET DEPLOYMENT STACK'S PASSWORD HERE
-  dcaeos_dcae_key_name: PUT DCAE TARGET DEPLOYMENT STACK'S UPLOADED KEY-PAIR NAME HERE
-  dcaeos_dcae_pub_key: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC KEY HERE
-  dcaeos_private_key: PUT DCAE TARGET DEPLOYMENT STACK'S PRIVATE KEY HERE
-  dcaeos_openstack_private_network_name: PUT DCAE TARGET DEPLOYMENT STACK'S INTERNAL NETWOKR ID HERE
-  dcaeos_public_net_id: PUT DCAE TARGET DEPLOYMENT STACK'S PUBLIC NETWORK ID HERE
-  dcaeos_ubuntu_1604_image: PUT DCAE TARGET DEPLOYMENT STACK'S UBUNTU1604 IMAGE ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_centos_7_image: PUT DCAE TARGET DEPLOYMENT STACK'S CENTOS7 IMAGE ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_security_group: PUT DCAE TARGET DEPLOYMENT STACK'S SECURITY GROUP ID (TO BE USED BY DCAE VMS) HERE
-  dcaeos_flavor_id: PUT DCAE TARGET DEPLOYMENT STACK'S VM FLAVOR ID (TO BE USED BY DCAE VMS) HERE
-
+  
+  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_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
+  dcae_centos_7_image: PUT THE CENTOS7 VM IMAGE NAME HERE FOR DCAE LAUNCHED CENTOS7 VM
+  dcae_security_group: PUT THE SECURITY GROUP NAME HERE FOR DCAE LAUNCHED VMS
+  dcae_key_name: PUT THE ON BOARDED KEY-PAIR NAME HERE FOR DCAE LAUNCHED VMS
+  dcae_public_key: PUT THE PUBLIC KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
+  dcae_private_key: PUT THE SECRET KEY OF A KEYPAIR HERE TO BE USED BETWEEN DCAE LAUNCHED VMS
 
   ################################
   #                              #