aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Main <imain@redhat.com>2016-05-05 21:02:35 +0000
committerIan Main <imain@redhat.com>2016-05-06 15:05:51 +0000
commit326199706a7a800d0d11aebdf7e60f48b508d0a6 (patch)
treeeed699bc1a5c21f327a790ac5d124a46e205de9d
parentc18950b41fdb2257da508aa1217ad77c21f1787f (diff)
Use docker-cmd hook.
This patch switches to use docker-cmd without changing the heat templates. Change-Id: I4a6a42819e83e3b70bf1e37c09d155c5cf8a7ee4
-rw-r--r--docker/compute-post.yaml6
-rw-r--r--docker/firstboot/start_docker_agents.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 09d0e9f..17000ac 100644
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -173,7 +173,7 @@ resources:
NovaComputeContainersConfigOVS:
type: OS::Heat::StructuredConfig
properties:
- group: docker-compose
+ group: docker-cmd
config:
ovsvswitchd:
image:
@@ -235,7 +235,7 @@ resources:
LibvirtContainersConfig:
type: OS::Heat::StructuredConfig
properties:
- group: docker-compose
+ group: docker-cmd
config:
computedata:
image:
@@ -280,7 +280,7 @@ resources:
NovaComputeContainersConfig:
type: OS::Heat::StructuredConfig
properties:
- group: docker-compose
+ group: docker-cmd
config:
neutronovsagent:
image:
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index 027aed4..cb8b2a5 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -23,7 +23,7 @@ Restart=on-failure
ExecStartPre=-/usr/bin/docker kill heat-agents
ExecStartPre=-/usr/bin/docker rm heat-agents
ExecStartPre=/usr/bin/docker pull $agent_image
-ExecStart=/usr/bin/docker run --name heat-agents --privileged --net=host -v /var/lib/etc-data:/var/lib/etc-data -v /run:/run -v /etc:/host/etc -v /usr/bin/atomic:/usr/bin/atomic -v /var/lib/dhclient:/var/lib/dhclient -v /var/lib/cloud:/var/lib/cloud -v /var/lib/heat-cfntools:/var/lib/heat-cfntools --entrypoint=/usr/bin/os-collect-config $agent_image
+ExecStart=/usr/bin/docker run --name heat-agents --privileged --net=host -v /var/lib/etc-data:/var/lib/etc-data -v /run:/run -v /etc:/host/etc -v /usr/bin/atomic:/usr/bin/atomic -v /var/lib/dhclient:/var/lib/dhclient -v /var/lib/cloud:/var/lib/cloud -v /var/lib/heat-cfntools:/var/lib/heat-cfntools -v /usr/bin/docker:/usr/bin/docker --entrypoint=/usr/bin/os-collect-config $agent_image
ExecStop=/usr/bin/docker stop heat-agents
[Install]