From 3a91bf76495f416c59ff55c4e47c4249292c0755 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Wed, 19 Jun 2019 13:37:59 -0500 Subject: [PATCH] Add sanity check to vip-prepender We recently had a deployment where the DNS VIP was not properly added to resolv.conf. There isn't enough detail in the logs from the script to determine what went wrong, so this change adds some more logging and a sanity check that we actually did the thing we were trying to do. --- .../NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender | 5 +++++ .../dispatcher.d/pre-up.d/dns-vip-prepender-worker | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender b/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender index 2b730129a..7608c1fdf 100644 --- a/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender +++ b/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender @@ -26,6 +26,11 @@ case "$STATUS" in logger -s "NM dns-vip-prepender: Looking for 'search $CLUSTER_DOMAIN' in /etc/resolv.conf to place 'nameserver $DNS_VIP'" sed -i "/^search .*$/a nameserver $DNS_VIP" /etc/resolv.conf + logger -s -f /etc/resolv.conf + if ! grep -q $DNS_VIP /etc/resolv.conf; then + logger -s "NM dns-vip-prepender: Failed to add DNS VIP to resolv.conf" + exit 1 + fi fi fi ;; diff --git a/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender-worker b/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender-worker index 406f888a3..527e0e621 100644 --- a/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender-worker +++ b/assets/files/etc/NetworkManager/dispatcher.d/pre-up.d/dns-vip-prepender-worker @@ -22,6 +22,11 @@ case "$STATUS" in logger -s "NM dns-vip-prepender-worker: Looking for 'search $CLUSTER_DOMAIN' in /etc/resolv.conf to place 'nameserver $DNS_VIP'" sed -i "/^search .*$/a nameserver $DNS_VIP" /etc/resolv.conf + logger -s -f /etc/resolv.conf + if ! grep -q $DNS_VIP /etc/resolv.conf; then + logger -s "NM dns-vip-prepender-worker: Failed to add DNS VIP to resolv.conf" + exit 1 + fi fi fi ;;