diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-06-22 08:34:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-22 08:34:42 +0000 |
| commit | 78d76ace2d2137609ada26cc3eda1405a2294f01 (patch) | |
| tree | f364fd83a36afdbd9d32104958d321f4d6ba7399 | |
| parent | a1fe1a29a0e9f794395e4b31306a32cd7ec8cb44 (diff) | |
| parent | 28cfc2b85207721ad89317d8113e336cc4c3bc07 (diff) | |
Merge "Fixes setting dns server for undercloud"
| -rwxr-xr-x | ci/deploy.sh | 6 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 753245c3..6d75bac0 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -981,7 +981,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 1ddf4620..9df8a1de 100644 --- 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) |