From 3fe3e40aa7a9100203536c00eb70801c7ec2ea52 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 16 Jun 2017 10:28:00 -0700 Subject: [PATCH] Actually use opendns Turns out that we set these vars via an evironment.d file in the DIB element which was overriding the finalise script's values to continue to use google dns as primary resolver. Update the environment.d file to use opendns by default with fallback being google dns. Change-Id: I87809d8917fdd5ca7319241934a006480b736bd3 --- nodepool/elements/nodepool-base/README.rst | 6 ++++-- .../nodepool-base/environment.d/75-nodepool-base-env | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nodepool/elements/nodepool-base/README.rst b/nodepool/elements/nodepool-base/README.rst index 7651cee70c..2ee6432f56 100644 --- a/nodepool/elements/nodepool-base/README.rst +++ b/nodepool/elements/nodepool-base/README.rst @@ -13,5 +13,7 @@ are. Default: The image should have the unbound DNS resolver package installed, the nodepool-base element then configures it to forward DNS queries to: - `NODEPOOL_STATIC_NAMESERVER_V6`, default: `2001:4860:4860::8888` - `NODEPOOL_STATIC_NAMESERVER_V4`, default: `8.8.8.8`. + `NODEPOOL_STATIC_NAMESERVER_V6`, default: `2620:0:ccc::2` + `NODEPOOL_STATIC_NAMESERVER_V4`, default: `208.67.222.222` + `NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK`, default: `2001:4860:4860::8888` + `NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK`, default: `8.8.8.8`. diff --git a/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env b/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env index 75492aa088..8ab773ca97 100644 --- a/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env +++ b/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env @@ -1,2 +1,4 @@ -export NODEPOOL_STATIC_NAMESERVER_V6=${NODEPOOL_STATIC_NAMESERVER_V6:-2001:4860:4860::8888} -export NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-8.8.8.8} +export NODEPOOL_STATIC_NAMESERVER_V6=${NODEPOOL_STATIC_NAMESERVER_V6:-2620:0:ccc::2} +export NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-208.67.222.222} +export NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK=${NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK:-2001:4860:4860::8888} +export NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK=${NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK:-8.8.8.8}