aboutsummaryrefslogtreecommitdiffstats
path: root/docker/firstboot/start_docker_agents.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-20 17:26:46 +0000
committerGerrit Code Review <review@openstack.org>2015-11-20 17:26:46 +0000
commit338a2bcfb30aa4aa1660e4eadf3d52c2e09a23c3 (patch)
treeef04f6034c4480bbcff3386baebdd64014181bc3 /docker/firstboot/start_docker_agents.sh
parentf6ff1a819190877093a90fb97ef7c9c8f6ce5164 (diff)
parent3a9186d6585d13528bf904a40556242c02ba4233 (diff)
Merge "Update docker compute environment to use json config"
Diffstat (limited to 'docker/firstboot/start_docker_agents.sh')
-rw-r--r--docker/firstboot/start_docker_agents.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index 88759a5..c8b404c 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -7,7 +7,7 @@ if ! hostname | grep compute &>/dev/null; then
exit 0
fi
-mkdir -p /var/lib/etc-data/ #FIXME: this should be a docker data container
+mkdir -p /var/lib/etc-data/json-config #FIXME: this should be a docker data container
# heat-docker-agents service
cat <<EOF > /etc/systemd/system/heat-docker-agents.service
@@ -43,9 +43,6 @@ EOF
/sbin/setenforce 0
/sbin/modprobe ebtables
-# Create /var/lib/etc-data for now. FIXME: This should go into a data container.
-#mkdir -p /var/lib/etc-data
-
echo nameserver 8.8.8.8 > /etc/resolv.conf
# We need hostname -f to return in a centos container for the puppet hook