openstack/heat-templates
Code Issues Proposed changes

Install docker-compose using pip

Browse Source 
This patch changes heat-container-agent to
a. pip install docker-compose
b. use latest fedora image(f23)

Change-Id: Ia1a841a3f0054c5c322eea118bdc6de3258eba34
This commit is contained in:
Rabi Mishra 2016-01-13 16:48:27 +05:30
parent 9a83954c13
commit d79b1237a6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,22 +1,19 @@
#!/bin/bash
set -eux
yum -y update
dnf -y update
yum -y install os-collect-config os-apply-config \
os-refresh-config dib-utils python-pip \
python-docker-py python-yaml
dnf -y install findutils os-collect-config os-apply-config \
os-refresh-config dib-utils python-pip python-docker-py \
python-yaml
yum clean all
dnf clean all
# pip installing dpath as python-dpath is an older version of dpath
pip install dpath
# using binary as 'docker-compose' and 'os-collect-config' has conflict on 'requests' version
# docker-compose pins requests version to 2.6.1
curl -L https://github.com/docker/compose/releases/download/1.4.0/docker-compose-`uname -s`-`uname -m` \
> /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
# install docker-compose
pip install docker-compose
# os-apply-config templates directory
oac_templates=/usr/libexec/os-apply-config/templates