From 345871e6846dac75c6ee8ce2654ad4d1fc95d1dd Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Wed, 3 Jun 2015 22:21:01 +0530
Subject: [PATCH] Fix folder name and update docker-compose version
Fixes folder name for script. Pins fedora base image to f21,
as latest fedora base image(f22) has number of changes that
breaks docker build. Upgrades docker-compose to latest
version that supports `--pid=host` (required by tripleo).
Change-Id: Ia4e32f1461bfc9278e25c9236dc911f1b9c4e876
---
.../boot-config/templates/fragments/start_container_agent.sh | 4 ++--
hot/software-config/heat-container-agent/Dockerfile | 4 +++-
.../heat-container-agent/scripts/configure_container_agent.sh | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hot/software-config/boot-config/templates/fragments/start_container_agent.sh b/hot/software-config/boot-config/templates/fragments/start_container_agent.sh
index c45590d2..438ee998 100644
--- a/hot/software-config/boot-config/templates/fragments/start_container_agent.sh
+++ b/hot/software-config/boot-config/templates/fragments/start_container_agent.sh
@@ -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
\ No newline at end of file
diff --git a/hot/software-config/heat-container-agent/Dockerfile b/hot/software-config/heat-container-agent/Dockerfile
index fe4c2a5f..ddd26b86 100644
--- a/hot/software-config/heat-container-agent/Dockerfile
+++ b/hot/software-config/heat-container-agent/Dockerfile
@@ -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
diff --git a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
index b129c2f5..2ddf55b8 100644
--- a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
+++ b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
@@ -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