opendev/system-config
Code Issues Proposed changes

Merge "Always forward to 8.8.8.8 on test nodes"

Browse Source
This commit is contained in:
Jenkins 2014-04-02 00:34:46 +00:00 committed by Gerrit Code Review
commit 4ac3719e84
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -24,15 +24,11 @@ PYPY=${5:-false}
ALL_MYSQL_PRIVS=${6:-false} ALL_MYSQL_PRIVS=${6:-false}
# Save the nameservers configured by our provider. # Save the nameservers configured by our provider.
echo 'forward-zone:' > /tmp/forwarding.conf cat >/tmp/forwarding.conf <<EOF
echo ' name: "."' >> /tmp/forwarding.conf forward-zone:
# HPCloud nameservers (which have 10. addresses) strip RRSIG records. name: "."
# Until this is resolved, use google instead. forward-addr: 8.8.8.8
if grep "^nameserver \(10\|206\)\." /etc/resolv.conf; then EOF
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
sudo hostname $HOSTNAME sudo hostname $HOSTNAME
# Fedora image doesn't come with wget # Fedora image doesn't come with wget