diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-05-26 13:28:18 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-05-26 13:28:18 -0400 |
| commit | 643b9b30066f0130f35e9ce7b1a8a7c24a244cc7 (patch) | |
| tree | e7bd28ef2e30a2366204cf9000d2080f591b889a | |
| parent | b5cdb506d814723aa53c1389037d6b641dadb445 (diff) | |
| parent | 67a822a04bec9aa81c35c7dc11641d219308c3de (diff) | |
| download | openshift-643b9b30066f0130f35e9ce7b1a8a7c24a244cc7.tar.gz openshift-643b9b30066f0130f35e9ce7b1a8a7c24a244cc7.tar.bz2 openshift-643b9b30066f0130f35e9ce7b1a8a7c24a244cc7.tar.xz openshift-643b9b30066f0130f35e9ce7b1a8a7c24a244cc7.zip | |
Merge pull request #1952 from sdodson/fix-resolv-conf
Fix resolv conf
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 5 | ||||
| -rwxr-xr-x | roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 5 |
3 files changed, 9 insertions, 3 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) 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 |