fix issue with external DNS list in Heat

Change-Id: I134281de656c25af6181ca5bf5d0246e7d786650
Signed-off-by: Marco Platania <platania@research.att.com>

6 files changed, 24 insertions, 12 deletions

diff --git a/heat/OpenECOMP/onap_openstack.env b/heat/OpenECOMP/onap_openstack.env
index 60e19d87..c0fa56db 100644
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/OpenECOMP/onap_openstack.env
@@ -63,7 +63,8 @@ parameters:
   #                    #
   ######################
 
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
 
   ### Private IP addresses ###
 
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 335cdba6..881472e1 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -123,9 +123,13 @@ parameters:
   #                    #
   ######################
 
-  external_dns:
+  dns_list:
     type: comma_delimited_list
-    description: External DNS for OAM ONAP network
+    description: List of External DNS for OAM ONAP network
+
+  external_dns:
+    type: string
+    description: First element of the dns_list for ONAP network
 
   ### Private IP addresses ###
   oam_network_cidr:
@@ -209,7 +213,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string
@@ -287,7 +291,7 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
       cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: external_dns }
+      dns_nameservers: { get_param: dns_list }
 
   router:
     type: OS::Neutron::Router
diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/OpenECOMP/onap_openstack_float.env
index 1dfc7f81..06ba61af 100644
--- a/heat/OpenECOMP/onap_openstack_float.env
+++ b/heat/OpenECOMP/onap_openstack_float.env
@@ -63,7 +63,8 @@ parameters:
   #                    #
   ######################
 
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
+  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
 
   ### Floating IP addresses ###
 
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 897e2a10..0ffe093a 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -123,9 +123,13 @@ parameters:
   #                    #
   ######################
 
-  external_dns:
+  dns_list:
     type: comma_delimited_list
-    description: External DNS for OAM ONAP network
+    description: List of External DNS for OAM ONAP network
+
+  external_dns:
+    type: string
+    description: First element of the dns_list for ONAP network
 
   ### Floating IP addresses ###
   aai_float_ip:
@@ -278,7 +282,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string
@@ -356,7 +360,7 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
       cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: external_dns }
+      dns_nameservers: { get_param: dns_list }
 
   router:
     type: OS::Neutron::Router
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.env b/heat/OpenECOMP/onap_openstack_nofloat.env
index 49b68e3f..07fa7132 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.env
+++ b/heat/OpenECOMP/onap_openstack_nofloat.env
@@ -63,6 +63,8 @@ parameters:
   #                    #
   ######################
 
+  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE
+
   oam_network_cidr: 10.0.0.0/8
   aai_ip_addr: 10.0.1.1
   appc_ip_addr: 10.0.2.1
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index 2a54b833..36b57ed9 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -124,7 +124,7 @@ parameters:
   ######################
 
   external_dns:
-    type: comma_delimited_list
+    type: string
     description: External DNS for OAM ONAP network
 
   ### Private IP addresses ###
@@ -209,7 +209,7 @@ parameters:
 
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
 
   dcae_zone:
     type: string