From 70f54810a5f1be527a983e273d9474a99d75ee7d Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 26 May 2016 10:24:07 -0400
Subject: Use grep to decide when to add our comment
According to the man page for resolv.conf # needs to be in the first collumn in
order to start a comment. While this didn't seem to affect glibc's resolver it
did really confuse the kubelet which parses the host's resolv.conf
---
roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
index 0d7941e4c..51a43d113 100755
--- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
@@ -51,6 +51,9 @@ EOF
done
systemctl restart dnsmasq
- sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"' # updated by \/etc\/NetworkManager\/dispatcher.d\/99-origin-dns.sh/g' /etc/resolv.conf
+ sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"'/g' /etc/resolv.conf
+ if ! grep -q '99-origin-dns.sh' /etc/resolv.conf; then
+ echo "# nameserver updated by /etc/NetworkManager/dispatcher.d/99-origin-dns.sh" >> /etc/resolv.conf
+ fi
fi
fi
--
cgit v1.2.3
From 67a822a04bec9aa81c35c7dc11641d219308c3de Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 26 May 2016 10:46:39 -0400
Subject: Automatic commit of package [openshift-ansible] release [3.0.94-1].
---
.tito/packages/openshift-ansible | 2 +-
openshift-ansible.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 137f6636b..9e57340b4 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.0.93-1 ./
+3.0.94-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index c3102a9d9..6f9083154 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -5,7 +5,7 @@
}
Name: openshift-ansible
-Version: 3.0.93
+Version: 3.0.94
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -205,6 +205,9 @@ Atomic OpenShift Utilities includes
%changelog
+* Thu May 26 2016 Scott Dodson <sdodson@redhat.com> 3.0.94-1
+- Use grep to decide when to add our comment (sdodson@redhat.com)
+
* Tue May 24 2016 Troy Dawson <tdawson@redhat.com> 3.0.93-1
- Fixup spec file (tdawson@redhat.com)
--
cgit v1.2.3