From 1a321b7a2fa61c8ec55b39d4548a6d0080108ec7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 20 Aug 2014 18:01:41 -0700
Subject: [PATCH] Fix unbound on rax centos6 nodes.

Rax centos6 nodes are dynamically configured via static file injection.
During boot our rc.local script runs to set resolv.conf nameserver to
127.0.0.1 then the ifup-post script runs and overwrites this
information with the "static" info in the ifcfg-* files. Modify the
ifcfg-* files in rc.local to prevent them from updating the nameservers
in resolv.conf.

Change-Id: I532e9fa4c40e0e0ce2aad35f4ae1f385a0619b70
---
 .../files/nodepool/scripts/prepare_node.sh                 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
index 28348a0db2..f51c56dd2e 100755
--- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
+++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh
@@ -83,9 +83,14 @@ fi
 # Overwrite /etc/resolv.conf at boot
 sudo dd of=/etc/rc.local <<EOF
 #!/bin/bash
-set -e
 set -o xtrace
 
+# Some providers inject dynamic network config statically. Work around this
+# for DNS nameservers. This is expected to fail on some nodes so remove -e.
+set +e
+sed -i -e 's/^\(DNS[0-9]*=[.0-9]\+\)/#\1/g' /etc/sysconfig/network-scripts/ifcfg-*
+set -e
+
 echo 'nameserver 127.0.0.1' > /etc/resolv.conf
 
 exit 0