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:
Maksim Malchuk 2016-03-09 22:42:46 +03:00
parent f1ce1d7be5
commit bbad3cd2fb
1 changed files with 4 additions and 2 deletions

View File

@ -156,12 +156,14 @@ enable_outbound_network_for_product_vm() {
# Check host nameserver configuration
echo -n "Checking local DNS configuration... "
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
if [ -z "$nameserver" ] && execute test -x /usr/bin/nmcli; then
# Get DNS from network manager
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
if [ -z "$nameserver" ]; then