summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-06-22 08:34:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-22 08:34:42 +0000
commit78d76ace2d2137609ada26cc3eda1405a2294f01 (patch)
treef364fd83a36afdbd9d32104958d321f4d6ba7399 /ci
parenta1fe1a29a0e9f794395e4b31306a32cd7ec8cb44 (diff)
parent28cfc2b85207721ad89317d8113e336cc4c3bc07 (diff)
Merge "Fixes setting dns server for undercloud"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 5 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