6 files changed, 115 insertions, 0 deletions
diff --git a/kolla/docker/heat/heat-api-cfn/Dockerfile.j2 b/kolla/docker/heat/heat-api-cfn/Dockerfile.j2
new file mode 100644
index 000000000..db3030c8d
--- /dev/null
+++ b/kolla/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -0,0 +1,13 @@
+FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block heat_api_cfn_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block heat_api_cfn_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/heat/heat-api/Dockerfile.j2 b/kolla/docker/heat/heat-api/Dockerfile.j2
new file mode 100644
index 000000000..af2471279
--- /dev/null
+++ b/kolla/docker/heat/heat-api/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block heat_api_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
+RUN chmod 644 /usr/local/bin/kolla_heat_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block heat_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/heat/heat-api/extend_start.sh b/kolla/docker/heat/heat-api/extend_start.sh
new file mode 100644
index 000000000..ddf4f81f4
--- /dev/null
+++ b/kolla/docker/heat/heat-api/extend_start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# 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
+    heat-manage db_sync
+
+    EXISTING_DOMAINS=$(openstack domain list -f value -c Name)
+
+    if ! echo "$EXISTING_DOMAINS" | grep '^heat_user_domain$' &>/dev/null; then
+        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-domain heat_user_domain --user heat_domain_admin admin
+    fi
+
+    exit 0
+fi
diff --git a/kolla/docker/heat/heat-base/Dockerfile.j2 b/kolla/docker/heat/heat-base/Dockerfile.j2
new file mode 100644
index 000000000..a06ea6f0d
--- /dev/null
+++ b/kolla/docker/heat/heat-base/Dockerfile.j2
@@ -0,0 +1,41 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block heat_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='heat') }}
+
+{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
+{% endif %}
+
+{% set heat_base_packages = [
+] %}
+
+{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
+
+ADD heat-base-archive /heat-base-source
+
+{% set heat_base_pip_packages = [
+    '/heat'
+] %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN ln -s heat-base-source/* heat \
+    && {{ macros.install_pip(heat_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/heat \
+    && cp -r /heat/etc/heat/* /etc/heat/ \
+    && cp /var/lib/kolla/venv/etc/pycadf/heat_api_audit_map.conf /etc/heat/ \
+    && touch /usr/local/bin/kolla_heat_extend_start \
+    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block heat_base_footer %}{% endblock %}
diff --git a/kolla/docker/heat/heat-base/extend_start.sh b/kolla/docker/heat/heat-base/extend_start.sh
new file mode 100644
index 000000000..1c1e86b8e
--- /dev/null
+++ b/kolla/docker/heat/heat-base/extend_start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/heat" ]]; then
+    mkdir -p /var/log/kolla/heat
+fi
+if [[ $(stat -c %U:%G /var/log/kolla/heat) != "heat:kolla" ]]; then
+    chown -R heat:kolla /var/log/kolla/heat
+fi
+if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
+    chmod 755 /var/log/kolla/heat
+fi
+
+. /usr/local/bin/kolla_heat_extend_start
diff --git a/kolla/docker/heat/heat-engine/Dockerfile.j2 b/kolla/docker/heat/heat-engine/Dockerfile.j2
new file mode 100644
index 000000000..86c943582
--- /dev/null
+++ b/kolla/docker/heat/heat-engine/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block heat_engine_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block heat_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER heat