openstack/kolla-ansible
Code Issues Proposed changes

Using new fedora base image from kollaglue

Browse Source 
Change-Id: I388113e5a9c748054a099ef1a3063863120e9a99
This commit is contained in:
Lars Kellogg-Stedman 2014-10-03 10:26:18 -04:00 committed by James Labocki
parent d94115c342
commit 1931a016b0
2 changed files with 21 additions and 5 deletions
docker/heat/heat-api
Dockerfilestart.sh

14
docker/heat/heat-api/Dockerfile

@ -1,6 +1,14 @@
FROM fedora-rdo-heat-base
MAINTAINER Steven Dake <sdake@redhat.com>
FROM kollaglue/fedora-rdo-base
MAINTAINER James Labocki <jlabocki@redhat.com>
RUN yum install -y openstack-heat-api \
openstack-heat-api-cfn \
openstack-heat-common \
openstack-heat-api-cloudwatch \
openstack-utils \
python-openstackclient \
&& yum clean all
ADD ./start.sh /start.sh
CMD ["/start.sh"]
CMD ["/start.sh"]

12
docker/heat/heat-api/start.sh

@ -1,5 +1,13 @@
#!/bin/sh
#!/bin/bash
set -e
: ${IP_ADDRESS:=$IP_ADDRESS}
if [ -z "$IP_ADDRESS" ]; then
echo >&2 'error: IP_ADDRESS is not set.'
echo >&2 ' Be sure to set IP_ADDRESS so it can be placed in heat configurations'
exit 1
fi
sh /opt/heat/config-glance.sh api
exec /usr/bin/heat-api