Merge "Remove DNS hack."

This commit is contained in:
Jenkins 2016-02-16 11:13:40 +00:00 committed by Gerrit Code Review
commit 43e0a3df21

View File

@ -48,8 +48,6 @@ fi
/sbin/setenforce 0 /sbin/setenforce 0
/sbin/modprobe ebtables /sbin/modprobe ebtables
echo nameserver 8.8.8.8 > /etc/resolv.conf
# We need hostname -f to return in a centos container for the puppet hook # We need hostname -f to return in a centos container for the puppet hook
HOSTNAME=$(hostname) HOSTNAME=$(hostname)
echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts