openstack/heat-templates
Code Issues Proposed changes

Merge "Fix folder name and update docker-compose version"

Browse Source
This commit is contained in:
Jenkins 2015-06-14 23:08:09 +00:00 committed by Gerrit Code Review
commit 302d21ad0f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hot/software-config/boot-config/templates/fragments/start_container_agent.sh
View File

@ -14,7 +14,7 @@ User=root
Restart=on-failure
ExecStartPre=-/usr/bin/docker kill heat-container-agent
ExecStartPre=-/usr/bin/docker rm heat-container-agent
ExecStartPre=/opt/agent_container/get_container_agent_image.sh $agent_image
ExecStartPre=/opt/container_agent/get_container_agent_image.sh $agent_image
ExecStart=/usr/bin/docker run --name heat-container-agent --privileged --net=host -v /usr/bin/atomic:/usr/bin/atomic -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/atomic:/usr/bin/atomic -v /var/lib/cloud:/var/lib/cloud -v /var/lib/heat-cfntools:/var/lib/heat-cfntools $agent_image
ExecStop=/usr/bin/docker stop heat-container-agent
@ -29,6 +29,6 @@ EOF
# enable and start heat-container-agent
chmod 0640 /etc/systemd/system/heat-container-agent.service
chmod 0755 /opt/agent_container/get_agent_container_image.sh
chmod 0755 /opt/container_agent/get_container_agent_image.sh
/usr/bin/systemctl enable heat-container-agent.service
/usr/bin/systemctl start --no-block heat-container-agent.service

4
hot/software-config/heat-container-agent/Dockerfile
View File

@ -1,4 +1,6 @@
FROM fedora
#Using Fedora 21, latest/22 has number of changes that
#breaks th build
FROM fedora:21
MAINTAINER “Rabi Mishra” <ramishra@redhat.com>
ENV container docker

4
hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
View File

@ -13,8 +13,8 @@ yum clean all
pip install dpath
# using binary as 'docker-compose' and 'os-collect-config' has conflict on 'requests' version
# os-collect-config requires 2.5.3 where as for docker-compose it's <2.5.0
curl -L https://github.com/docker/compose/releases/download/1.1.0/docker-compose-`uname -s`-`uname -m` \
# 1.3.0rc1 required by tripleo
curl -L https://github.com/docker/compose/releases/download/1.3.0rc1/docker-compose-`uname -s`-`uname -m` \
> /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose