summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_dnsmasq
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-25 17:07:57 -0400
committerScott Dodson <sdodson@redhat.com>2017-06-18 21:14:29 -0400
commit48cb038635b0508cc6c1218d3d23fb8ccd6551fe (patch)
treeebdd765c5fc319301fe71a77b7ff54f94f68e141 /roles/openshift_node_dnsmasq
parent9545204f504f1dcf3de18272dc1fb951dd15f486 (diff)
downloadopenshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.gz
openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.bz2
openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.tar.xz
openshift-48cb038635b0508cc6c1218d3d23fb8ccd6551fe.zip
Push to the registry via dns
Configures OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc Adds 'cluster.local' to dns search on nodes via dispatcher script Adds '.svc' to NO_PROXY defaults
Diffstat (limited to 'roles/openshift_node_dnsmasq')
-rwxr-xr-xroles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh3
1 files changed, 3 insertions, 0 deletions
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 24798d3d2..c68073a10 100755
--- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
@@ -96,6 +96,9 @@ EOF
if ! grep -q '99-origin-dns.sh' ${NEW_RESOLV_CONF}; then
echo "# nameserver updated by /etc/NetworkManager/dispatcher.d/99-origin-dns.sh" >> ${NEW_RESOLV_CONF}
fi
+ if ! grep -q 'search.*cluster.local' ${NEW_RESOLV_CONF}; then
+ sed -i '/^search/ s/$/ cluster.local/' ${NEW_RESOLV_CONF}
+ fi
cp -Z ${NEW_RESOLV_CONF} /etc/resolv.conf
fi
fi