Merge "Using new fedora base image from kollaglue"

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

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