Don't use IPv6 DNS servers for the Fuel
Fuel don't support IPv6 yet, so we shouldn't use IPv6 DNS servers from the local /etc/resolv.conf. Change-Id: Ia6ec6bf0bf3c100c591f82cd9b8785a00e93f016 Closes-Bug: #1553568
This commit is contained in:
parent
f1ce1d7be5
commit
bbad3cd2fb
|
@ -156,12 +156,14 @@ enable_outbound_network_for_product_vm() {
|
||||||
# Check host nameserver configuration
|
# Check host nameserver configuration
|
||||||
echo -n "Checking local DNS configuration... "
|
echo -n "Checking local DNS configuration... "
|
||||||
if execute test -f /etc/resolv.conf ; then
|
if execute test -f /etc/resolv.conf ; then
|
||||||
nameserver="$(execute grep '^nameserver' /etc/resolv.conf | grep -v 'nameserver\s\s*127.' | head -3)"
|
# we should exclude loopback and IPv6 addresses from the nameservers list
|
||||||
|
nameserver="$(execute grep '^nameserver' /etc/resolv.conf | egrep -v 'nameserver\s*(127\.|.*:)' | head -3)"
|
||||||
fi
|
fi
|
||||||
if [ -z "$nameserver" ] && execute test -x /usr/bin/nmcli; then
|
if [ -z "$nameserver" ] && execute test -x /usr/bin/nmcli; then
|
||||||
# Get DNS from network manager
|
# Get DNS from network manager
|
||||||
if [ -n "`execute LANG=C nmcli nm | grep \"running\s\+connected\"`" ]; then
|
if [ -n "`execute LANG=C nmcli nm | grep \"running\s\+connected\"`" ]; then
|
||||||
nameserver="$(execute nmcli dev list | grep 'IP[46].DNS' | sed -e 's/IP[46]\.DNS\[[0-9]\+\]:\s\+/nameserver /'| grep -v 'nameserver\s\s*127.' | head -3)"
|
# we should exclude loopback and IPv6 addresses from the nameservers list
|
||||||
|
nameserver="$(execute nmcli dev list | grep 'IP[46].DNS' | sed -e 's/IP[46]\.DNS\[[0-9]\+\]:\s\+/nameserver /'| grep -v 'nameserver\s*(127\.|.*:)' | head -3)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -z "$nameserver" ]; then
|
if [ -z "$nameserver" ]; then
|
||||||
|
|
Loading…
Reference in New Issue