aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-16 11:13:40 +0000
committerGerrit Code Review <review@openstack.org>2016-02-16 11:13:40 +0000
commit43e0a3df21a7800cc670bb23388ccb42609b1b75 (patch)
tree9374da2a44ded1d1ba8cfb77e91825f864650af0 /docker
parent3b43b120afb1bab623304a62f5655075d6ddb67d (diff)
parente7dc316bff9650fb389a15a5696426efb5bd8164 (diff)
Merge "Remove DNS hack."
Diffstat (limited to 'docker')
-rw-r--r--docker/firstboot/start_docker_agents.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index 2b03b96..963c7ee 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -48,8 +48,6 @@ fi
/sbin/setenforce 0
/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
HOSTNAME=$(hostname)
echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts