From 704e818edaa92cffac02ffbf361098f463e5170e Mon Sep 17 00:00:00 2001
From: "Anderson, Craig (ca846m)" <craig.anderson@att.com>
Date: Sat, 25 Jan 2020 10:15:04 -0800
Subject: [PATCH] Fix systemd-resolved race conditions

1. systemd-resolved should be removed/disabled before the symlink is
2. `domain` is redundant with the FQDN and replaced by `search`
3. correct resolv.conf EOL formatting issue

Change-Id: If7f8037c0623d9b1eb43171f09e492985a66b351
---
 promenade/templates/include/up.sh                | 10 ++++++----
 promenade/templates/roles/common/etc/resolv.conf |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

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 %}
+