aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-02 12:26:30 -0700
committerSteven Dake <stdake@cisco.com>2015-08-29 23:58:54 -0700
commit5e521f0550cab5989580fe1a92c112d367f33072 (patch)
treecfe655ebc71356bbeaccb74d6aa85cd89abee414 /docker/heat
parent730276aaf96cc6915b0fc4b2d08e366c7568338e (diff)
downloadkolla-5e521f0550cab5989580fe1a92c112d367f33072.tar.gz
kolla-5e521f0550cab5989580fe1a92c112d367f33072.zip
Add Ansible support for Heat
This changes bootstrapping of the Heat container to bootstrap the Heat container with a heat domain user. This requires some work from bootstrap.yml to pass in several environment variables needed by the heat domain setup script. Co-Authored-By: Sam Yaple <sam@yaple.net> Change-Id: Iab05983754fa514835cb5ff54d775faa18773110 Partially-implements: blueprint ansible-heat
Diffstat (limited to 'docker/heat')
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j24
-rw-r--r--docker/heat/heat-api/Dockerfile.j24
-rw-r--r--docker/heat/heat-api/config-external.sh4
-rwxr-xr-xdocker/heat/heat-api/start.sh10
4 files changed, 14 insertions, 8 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index f199c16cf..0e0b09907 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -4,9 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-RUN yum -y install \
- openstack-heat-api-cfn \
- python-openstackclient \
+RUN yum -y install openstack-heat-api-cfn \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 8a782d8d3..25cbcf9f5 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -4,9 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-RUN yum -y install \
- openstack-heat-api \
- python-openstackclient \
+RUN yum -y install openstack-heat-api \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
diff --git a/docker/heat/heat-api/config-external.sh b/docker/heat/heat-api/config-external.sh
index ca5d73e90..2da92b203 100644
--- a/docker/heat/heat-api/config-external.sh
+++ b/docker/heat/heat-api/config-external.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-SOURCE="/opt/kolla/heat-api/heat-api.conf"
-TARGET="/etc/heat/heat-api.conf"
+SOURCE="/opt/kolla/heat-api/heat.conf"
+TARGET="/etc/heat/heat.conf"
OWNER="heat"
if [[ -f "$SOURCE" ]]; then
diff --git a/docker/heat/heat-api/start.sh b/docker/heat/heat-api/start.sh
index a7b14b1d9..25bfa2bff 100755
--- a/docker/heat/heat-api/start.sh
+++ b/docker/heat/heat-api/start.sh
@@ -10,4 +10,14 @@ source /opt/kolla/kolla-common.sh
# Execute config strategy
set_configs
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+ su -s /bin/sh -c "heat-manage db_sync" heat
+ openstack domain create heat_user_domain
+ openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
+ openstack role add --domain heat_user_domain --user heat_domain_admin admin
+ exit 0
+fi
+
exec $CMD $ARGS