Fixes setting dns server for undercloud

JIRA: APEX-177

Change-Id: I6ee95a3c525fb58699fb3af795a66639f217214c
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 05e2fa2..25527da 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -975,7 +975,11 @@ openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boo
 openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" --property "capabilities:profile"="control" control
 openstack flavor set --property "cpu_arch"="x86_64" --property "capabilities:boot_option"="local" --property "capabilities:profile"="compute" compute
 echo "Configuring nameserver on ctlplane network"
-neutron subnet-update \$(neutron subnet-list | grep -v id | grep -v \\\\-\\\\- | awk {'print \$2'}) --dns-nameserver 8.8.8.8
+dns_server_ext=''
+for dns_server in ${dns_servers}; do
+  dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}"
+done
+neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext}
 echo "Executing overcloud deployment, this should run for an extended period without output."
 sleep 60 #wait for Hypervisor stats to check-in to nova
 # save deploy command so it can be used for debugging

diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py
index 1ddf462..9df8a1d 100644 (file)
--- a/lib/python/apex/network_settings.py
+++ b/lib/python/apex/network_settings.py
@@ -223,6 +223,11 @@ class NetworkSettings:
         bash_str += "enabled_network_list='{}'\n" \
             .format(' '.join(self.enabled_network_list))
         bash_str += "ip_addr_family={}\n".format(self.get_ip_addr_family())
+        dns_list = ""
+        for dns_server in self.settings_obj['dns_servers']:
+            dns_list = dns_list + "{} ".format(dns_server)
+        dns_list = dns_list.strip()
+        bash_str += "dns_servers=\'{}\'\n".format(dns_list)
         if path:
             with open(path, 'w') as file:
                 file.write(bash_str)