openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use docker-cmd hook."

This commit is contained in:
Jenkins 2016-05-27 18:35:14 +00:00 committed by Gerrit Code Review
parent 9036e73afe 326199706a
commit 5918136397
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/compute-post.yaml
View File

@ -173,7 +173,7 @@ resources:
NovaComputeContainersConfigOVS:
type: OS::Heat::StructuredConfig
properties:
group: docker-compose
group: docker-cmd
config:
ovsvswitchd:
image:
@ -236,7 +236,7 @@ resources:
LibvirtContainersConfig:
type: OS::Heat::StructuredConfig
properties:
group: docker-compose
group: docker-cmd
config:
computedata:
image:
@ -281,7 +281,7 @@ resources:
NovaComputeContainersConfig:
type: OS::Heat::StructuredConfig
properties:
group: docker-compose
group: docker-cmd
config:
neutronovsagent:
image:

2
docker/firstboot/start_docker_agents.sh
View File

@ -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]