diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2014-10-14 11:44:30 -0400 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2014-10-20 17:35:41 -0400 |
| commit | 40ba2909d8f470a48221fa7f005ea3f2dfdf8704 (patch) | |
| tree | 6716e2bb0957000102a979e8987a041c4ecf05f7 /docker/heat/heat-base | |
| parent | ad615338cc141105253f772315a5905a86c91a42 (diff) | |
| download | kolla-40ba2909d8f470a48221fa7f005ea3f2dfdf8704.tar.gz kolla-40ba2909d8f470a48221fa7f005ea3f2dfdf8704.zip | |
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
Diffstat (limited to 'docker/heat/heat-base')
| -rw-r--r-- | docker/heat/heat-base/Dockerfile | 13 | ||||
| -rwxr-xr-x | docker/heat/heat-base/config-heat.sh | 65 |
2 files changed, 69 insertions, 9 deletions
diff --git a/docker/heat/heat-base/Dockerfile b/docker/heat/heat-base/Dockerfile index 1904d189c..1bc0c6c8e 100644 --- a/docker/heat/heat-base/Dockerfile +++ b/docker/heat/heat-base/Dockerfile @@ -1,10 +1,5 @@ -FROM fedora-rdo-base -MAINTAINER Steven Dake <sdake@redhat.com> +FROM kollaglue/fedora-rdo-base +MAINTAINER Jeff Peeler <jpeeler@redhat.com> -RUN yum -y install \ - openstack-utils \ - openstack-heat && yum clean all - -# These will come after we sort out start time config -#RUN mkdir /opt/heat -#COPY config-heat.sh /opt/heat/config-heat.sh +RUN mkdir -p /opt/kolla +COPY config-heat.sh /opt/kolla/config-heat.sh diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh new file mode 100755 index 000000000..c2837325c --- /dev/null +++ b/docker/heat/heat-base/config-heat.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh + +: ${ADMIN_TENANT_NAME:=admin} +: ${HEAT_DB_NAME:=heat} +: ${HEAT_DB_USER:=heat} +: ${HEAT_KEYSTONE_USER:=heat} +: ${KEYSTONE_AUTH_PROTOCOL:=http} +: ${PUBLIC_IP:=$HEAT_API_PORT_8004_TCP_ADDR} +: ${RABBIT_USER:=guest} +: ${RABBIT_PASSWORD:=guest} + +check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD +dump_vars + +cat > /openrc <<EOF +export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +export OS_USERNAME="${HEAT_KEYSTONE_USER}" +export OS_PASSWORD="${HEAT_KEYSTONE_PASSWORD}" +export OS_TENANT_NAME="${ADMIN_TENANT_NAME}" +EOF + +crudini --set /etc/heat/heat.conf DEFAULT log_file \ + "" +crudini --set /etc/heat/heat.conf DEFAULT use_stderr \ + true +crudini --set /etc/heat/heat.conf DEFAULT rpc_backend \ + heat.openstack.common.rpc.impl_kombu +crudini --set /etc/heat/heat.conf DEFAULT rabbit_host \ + ${RABBITMQ_SERVICE_HOST} +crudini --set /etc/heat/heat.conf DEFAULT rabbit_userid \ + ${RABBIT_USER} +crudini --set /etc/heat/heat.conf DEFAULT rabbit_password \ + ${RABBIT_PASSWORD} + +crudini --set /etc/heat/heat.conf database connection \ + mysql://${HEAT_DB_USER}:${HEAT_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${HEAT_DB_NAME} + +crudini --set /etc/heat/heat.conf keystone_authtoken auth_protocol \ + "${KEYSTONE_AUTH_PROTOCOL}" +crudini --set /etc/heat/heat.conf keystone_authtoken auth_host \ + "${KEYSTONE_PUBLIC_SERVICE_HOST}" +crudini --set /etc/heat/heat.conf keystone_authtoken auth_port \ + 5000 +crudini --set /etc/heat/heat.conf keystone_authtoken auth_uri \ + "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" +crudini --set /etc/heat/heat.conf keystone_authtoken admin_tenant_name \ + "${ADMIN_TENANT_NAME}" +crudini --set /etc/heat/heat.conf keystone_authtoken admin_user \ + "${HEAT_KEYSTONE_USER}" +crudini --set /etc/heat/heat.conf keystone_authtoken admin_password \ + "${HEAT_KEYSTONE_PASSWORD}" + +crudini --set /etc/heat/heat.conf ec2authtoken auth_uri \ + "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" + +# cfn +#crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \ +# http://${HEAT_CFN_API_SERVICE_HOST}:8000 +#crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \ +# http://${HEAT_CFN_API_SERVICE_HOST}:8000/v1/waitcondition + |
