summaryrefslogtreecommitdiffstats
path: root/anslib
diff options
context:
space:
mode:
Diffstat (limited to 'anslib')
m---------anslib/openshift-ansible0
-rw-r--r--anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch7
2 files changed, 4 insertions, 3 deletions
diff --git a/anslib/openshift-ansible b/anslib/openshift-ansible
-Subproject 22d3a96deaf74b7aa9aa021a73ef39e2b4da337
+Subproject 974da273128f43a564967716a7386b59f883254
diff --git a/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch b/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch
index 687be8a..0ffdc5e 100644
--- a/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch
+++ b/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch
@@ -12,10 +12,10 @@ index ea28064..df95ba3 100644
file: /etc/dnsmasq.d/node-dnsmasq.conf
lines:
diff --git a/roles/openshift_node/files/networkmanager/99-origin-dns.sh b/roles/openshift_node/files/networkmanager/99-origin-dns.sh
-index acf3e2f..16129a2 100755
+index acf3e2f..8c597a6 100755
--- a/roles/openshift_node/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node/files/networkmanager/99-origin-dns.sh
-@@ -43,10 +43,25 @@ if [[ $2 =~ ^(up|dhcp4-change|dhcp6-change)$ ]]; then
+@@ -43,10 +43,26 @@ if [[ $2 =~ ^(up|dhcp4-change|dhcp6-change)$ ]]; then
######################################################################
# couldn't find an existing method to determine if the interface owns the
# default route
@@ -40,7 +40,8 @@ index acf3e2f..16129a2 100755
+ def_routes_int=$(for r in ${def_routes}; do /sbin/ip route get to ${r} | awk '{print $3}'; done)
+ interfaces="${def_route_int} ${def_routes_int}"
+
-+ if [[ "${interfaces}" =~ (^|[[:space:]])${DEVICE_IFACE}($|[[:space:]]) ]]; then
++ nsconf=$(grep -P ^nameserver /etc/resolv.conf | wc -l)
++ if [[ $nsconf -gt 0 && "${interfaces}" =~ (^|[[:space:]])${DEVICE_IFACE}($|[[:space:]]) ]]; then
+# if [[ ${DEVICE_IFACE} == ${def_route_int} ]]; then
if [ ! -f /etc/dnsmasq.d/origin-dns.conf ]; then
cat << EOF > /etc/dnsmasq.d/origin-dns.conf