summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-16 14:54:26 -0400
committerTim Rozet <trozet@redhat.com>2016-06-17 11:21:27 -0400
commit28cfc2b85207721ad89317d8113e336cc4c3bc07 (patch)
treed2e06925a739272785eb347882e65215d7ba7894 /ci/deploy.sh
parenta5967c102534cfe5a12850a8e34634e997c08b03 (diff)
Fixes setting dns server for undercloud
JIRA: APEX-177 Change-Id: I6ee95a3c525fb58699fb3af795a66639f217214c Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 05e2fa2..25527da 100755
--- 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