diff options
| author |   Ryan Hallisey <rhallise@redhat.com> | 2015-10-13 12:00:20 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-11-02 19:30:37 +0000 |
| commit | 3a9186d6585d13528bf904a40556242c02ba4233 (patch) | |
| tree | cdd5cf76f5bbe0057dc17150e9231cc51d9fe266 /docker/firstboot/start_docker_agents.sh | |
| parent | 04327663a90fdb2caa963b21072e599a66e61d05 (diff) | |
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 <jpeeler@redhat.com>
Diffstat (limited to 'docker/firstboot/start_docker_agents.sh')
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 5 |
1 files changed, 1 insertions, 4 deletions
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 <<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 |