From 40ba2909d8f470a48221fa7f005ea3f2dfdf8704 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 14 Oct 2014 11:44:30 -0400 Subject: Implement containers for heat-engine and heat-api Loosely followed this document for setting up Heat: http://docs.openstack.org/icehouse/install-guide/install/yum/content/heat-install.html Some gotchas: - crux doesn't require escaping parenthesis for endpoint creation like keystone client - heat icehouse packages are configured for qpid, so kombu had to be specified specifically This firewall reference was handy for port information: http://docs.openstack.org/trunk/config-reference/content/firewalls-default-ports.html Implements: blueprint kube-heat-container Change-Id: Ie4291a6c4c2b85a23a71fc0a003d9160bf0a32b8 --- docker/heat/heat-engine/Dockerfile | 9 +++++--- docker/heat/heat-engine/start.sh | 42 +++++++++----------------------------- 2 files changed, 16 insertions(+), 35 deletions(-) mode change 100644 => 100755 docker/heat/heat-engine/start.sh (limited to 'docker/heat/heat-engine') diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile index 49b80e1f6..163e97a2d 100644 --- a/docker/heat/heat-engine/Dockerfile +++ b/docker/heat/heat-engine/Dockerfile @@ -1,6 +1,9 @@ -FROM fedora-rdo-base -MAINTAINER Steven Dake +FROM kollaglue/fedora-rdo-heat-base +MAINTAINER Jeff Peeler + +RUN yum -y install \ + openstack-heat-engine \ + ; yum clean all ADD ./start.sh /start.sh CMD ["/start.sh"] - diff --git a/docker/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh old mode 100644 new mode 100755 index 306cbbace..0ab9e4800 --- a/docker/heat/heat-engine/start.sh +++ b/docker/heat/heat-engine/start.sh @@ -1,40 +1,18 @@ #!/bin/sh -: ${GLANCE_DB_USER:=heat} -: ${GLANCE_DB_NAME:=heat} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${GLANCE_KEYSTONE_USER:=heat} -: ${ADMIN_TENANT_NAME:=admin} +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-heat.sh -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi +check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \ + HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD +check_for_db -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi - -if ! [ "$GLANCE_DB_PASSWORD" ]; then - GLANCE_DB_PASSWORD=$(openssl rand -hex 15) - export GLANCE_DB_PASSWORD -fi - -sh /opt/heat/config-heat.sh engine - -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ - -p${DB_ROOT_PASSWORD} mysql <