From 3a9186d6585d13528bf904a40556242c02ba4233 Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Tue, 13 Oct 2015 12:00:20 -0400 Subject: Update docker compute environment to use json config In liberty, Kolla copies around files and runs the service given a specified command, by reading a json file. This will update the existing work to follow that template by creating a json file for each of the services and pushing it into the containers. Change-Id: I5085d1896ea965fd8854765b055068a5ad30bcfd Co-Authored-By: Jeff Peeler --- docker/firstboot/start_docker_agents.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docker/firstboot') diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index caf511bd..cb7c57ff 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 < /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 -- cgit 1.2.3-korg