From f504d4720011f45cd9fad5c525138d4d6832215c Mon Sep 17 00:00:00 2001
From: Gregory Haynes <greg@greghaynes.net>
Date: Thu, 19 Feb 2015 14:11:49 -0800
Subject: [PATCH] Support custom static nameserver during build

We statically set 8.8.8.8 for a dns resolver in prepare-node. Allow
setting a custom nameserver.

Change-Id: I888c4bcefdf36ad7064d66b6a1e75d996b93b375
---
 .../elements/nodepool-base/environment.d/75-nodepool-base-env  | 1 +
 nodepool/elements/nodepool-base/finalise.d/99-unbound          | 3 ++-
 nodepool/elements/puppet/bin/prepare-node                      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env

diff --git a/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env b/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env
new file mode 100644
index 0000000000..5494387077
--- /dev/null
+++ b/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env
@@ -0,0 +1 @@
+export NODEPOOL_STATIC_NAMESERVER=${NODEPOOL_STATIC_NAMESERVER:-8.8.8.8}
diff --git a/nodepool/elements/nodepool-base/finalise.d/99-unbound b/nodepool/elements/nodepool-base/finalise.d/99-unbound
index ddf28346f1..f4fbb135dd 100755
--- a/nodepool/elements/nodepool-base/finalise.d/99-unbound
+++ b/nodepool/elements/nodepool-base/finalise.d/99-unbound
@@ -17,11 +17,12 @@
 
 set -e
 
+NODEPOOL_STATIC_NAMESERVER=${NODEPOOL_STATIC_NAMESERVER:-8.8.8.8}
 # The puppet modules should install unbound.
 dd of=/tmp/forwarding.conf <<EOF
 forward-zone:
   name: "."
-  forward-addr: 8.8.8.8
+  forward-addr: $NODEPOOL_STATIC_NAMESERVER
 EOF
 
 mv /tmp/forwarding.conf /etc/unbound/
diff --git a/nodepool/elements/puppet/bin/prepare-node b/nodepool/elements/puppet/bin/prepare-node
index 5518721ec8..f7e47350b3 100644
--- a/nodepool/elements/puppet/bin/prepare-node
+++ b/nodepool/elements/puppet/bin/prepare-node
@@ -48,4 +48,4 @@ fi
 set -e
 
 # Make sure resolv.conf settings don't break dib
-echo 'nameserver 8.8.8.8'> /etc/resolv.conf
+echo "nameserver $NODEPOOL_STATIC_NAMESERVER"> /etc/resolv.conf