diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-03 14:54:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-03 14:54:14 +0000 |
| commit | 33c47051764767f6005a558813cd7dbebe54fc82 (patch) | |
| tree | 8ce1f48a14088e6778f70ed65c9c896e3e5e49ca /docker | |
| parent | e949735c3d0b9a8268f7e39f6ec6f7fb106e6b7c (diff) | |
| parent | 1931a016b06dd1c1b18dc0328497d19d16f024ac (diff) | |
| download | kolla-33c47051764767f6005a558813cd7dbebe54fc82.tar.gz kolla-33c47051764767f6005a558813cd7dbebe54fc82.zip | |
Merge "Using new fedora base image from kollaglue"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-api/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/heat/heat-api/start.sh | 12 |
2 files changed, 21 insertions, 5 deletions
diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile index 4a7799335..44ff6ed93 100644 --- a/docker/heat/heat-api/Dockerfile +++ b/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"] diff --git a/docker/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh index 9a35a49b9..8f73ae3e2 100644 --- a/docker/heat/heat-api/start.sh +++ b/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 |