From 0e9ddc78ab61c094533218a9bb1c99d2c75e1f51 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 31 Mar 2014 13:04:30 -0700 Subject: [PATCH] Always forward to 8.8.8.8 on test nodes Our providers have unreliable DNS in different ways. Instead of special casing all of them, just always forward queries to 8.8.8.8 until we have our own neutron-local recursive resolvers. Closes-Bug: 1286963 Change-Id: I5eca2e2db75b38f829ba458bb8c3789646f562c2 --- .../files/nodepool/scripts/prepare_node.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh index a565d24a0a..8327127da0 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh @@ -24,15 +24,11 @@ PYPY=${5:-false} ALL_MYSQL_PRIVS=${6:-false} # Save the nameservers configured by our provider. -echo 'forward-zone:' > /tmp/forwarding.conf -echo ' name: "."' >> /tmp/forwarding.conf -# HPCloud nameservers (which have 10. addresses) strip RRSIG records. -# Until this is resolved, use google instead. -if grep "^nameserver \(10\|206\)\." /etc/resolv.conf; then - echo " forward-addr: 8.8.8.8">> /tmp/forwarding.conf -else - grep "^nameserver" /etc/resolv.conf|sed 's/nameserver \(.*\)/ forward-addr: \1/' >> /tmp/forwarding.conf -fi +cat >/tmp/forwarding.conf <