diff --git a/nodepool/elements/nodepool-base/README.rst b/nodepool/elements/nodepool-base/README.rst index 703ae79415..5dec06ee4a 100644 --- a/nodepool/elements/nodepool-base/README.rst +++ b/nodepool/elements/nodepool-base/README.rst @@ -18,13 +18,13 @@ 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_V4``, default: ``208.67.222.222`` + ``NODEPOOL_STATIC_NAMESERVER_V4``, default: ``1.1.1.1`` ``NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK``, default: ``8.8.8.8``. If ``NODEPOOL_STATIC_NAMESERVER_POPULATE_IPV6`` is set to ``1`` then the following two servers will be configured as forwarders too - ``NODEPOOL_STATIC_NAMESERVER_V6``, default: ``2620:0:ccc::2`` + ``NODEPOOL_STATIC_NAMESERVER_V6``, default: ``2606:4700:4700::1111`` ``NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK``, default: ``2001:4860:4860::8888`` Note externally setting either of these values implies 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 8ab773ca97..594e5e7fa8 100644 --- a/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env +++ b/nodepool/elements/nodepool-base/environment.d/75-nodepool-base-env @@ -1,4 +1,4 @@ -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=${NODEPOOL_STATIC_NAMESERVER_V6:-2606:4700:4700::1111} +export NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-1.1.1.1} 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} diff --git a/nodepool/elements/nodepool-base/finalise.d/89-unbound b/nodepool/elements/nodepool-base/finalise.d/89-unbound index 9fe3973354..af91481274 100755 --- a/nodepool/elements/nodepool-base/finalise.d/89-unbound +++ b/nodepool/elements/nodepool-base/finalise.d/89-unbound @@ -31,7 +31,7 @@ set -e # [1] http://git.openstack.org/cgit/openstack-infra/openstack-zuul-jobs/tree/roles/configure-unbound # -NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-208.67.222.222} +NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-1.1.1.1} NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK=${NODEPOOL_STATIC_NAMESERVER_V4_FALLBACK:-8.8.8.8} # Explicitly setting a v6 nameserver implies you want ipv6 @@ -40,7 +40,7 @@ if [[ -n ${NODEPOOL_STATIC_NAMESERVER_V6:-} || -n ${NODEPOOL_STATIC_NAMESERVER_V fi if [[ ${NODEPOOL_STATIC_NAMESERVER_POPULATE_IPV6:-0} == 1 ]]; then - NODEPOOL_STATIC_NAMESERVER_V6=${NODEPOOL_STATIC_NAMESERVER_V6:-2620:0:ccc::2} + NODEPOOL_STATIC_NAMESERVER_V6=${NODEPOOL_STATIC_NAMESERVER_V6:-2606:4700:4700::1111} NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK=${NODEPOOL_STATIC_NAMESERVER_V6_FALLBACK:-2001:4860:4860::8888} dd of=/tmp/forwarding.conf <