diff --git a/promenade/templates/include/up.sh b/promenade/templates/include/up.sh index 5555eb2b..18c9ecd3 100644 --- a/promenade/templates/include/up.sh +++ b/promenade/templates/include/up.sh @@ -1,14 +1,16 @@ # Disable overwriting our resolv.conf # -if [ -h /etc/resolv.conf ]; then - log "=== Removing resolv.conf symlink ===" - rm -f /etc/resolv.conf -fi systemctl disable systemd-resolved.service systemctl stop systemd-resolved.service systemctl mask systemd-resolved.service +if [ -h /etc/resolv.conf ]; then + log "=== Removing resolv.conf symlink ===" + rm -f /etc/resolv.conf + touch /etc/resolv.conf +fi + CURATED_DIRS=( /etc/kubernetes /var/lib/etcd diff --git a/promenade/templates/roles/common/etc/resolv.conf b/promenade/templates/roles/common/etc/resolv.conf index 09b082c8..e5b45eb2 100644 --- a/promenade/templates/roles/common/etc/resolv.conf +++ b/promenade/templates/roles/common/etc/resolv.conf @@ -1,7 +1,8 @@ options timeout:1 attempts:1 -domain {{ config.get_first('Genesis:domain', 'KubernetesNode:domain', default='local') }} +search {{ config.get_first('Genesis:domain', 'KubernetesNode:domain', default='local') }} nameserver {{ config['KubernetesNetwork:dns.service_ip'] }} {% for server in config['KubernetesNetwork:dns.upstream_servers'] | default([]) %} nameserver {{ server }} {%- endfor %} +