7 files changed, 122 insertions, 0 deletions
diff --git a/kolla/docker/mistral/mistral-api/Dockerfile.j2 b/kolla/docker/mistral/mistral-api/Dockerfile.j2
new file mode 100644
index 000000000..be3e431e1
--- /dev/null
+++ b/kolla/docker/mistral/mistral-api/Dockerfile.j2
@@ -0,0 +1,20 @@
+FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block mistral_api_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% set mistral_api_packages = [
+] %}
+{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
+
+COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
+RUN chmod 644 /usr/local/bin/kolla_mistral_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block mistral_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/mistral/mistral-api/extend_start.sh b/kolla/docker/mistral/mistral-api/extend_start.sh
new file mode 100644
index 000000000..113adb8a2
--- /dev/null
+++ b/kolla/docker/mistral/mistral-api/extend_start.sh
@@ -0,0 +1,9 @@
+#!/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
+    mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head
+    mistral-db-manage --config-file /etc/mistral/mistral.conf populate
+    exit 0
+fi
diff --git a/kolla/docker/mistral/mistral-base/Dockerfile.j2 b/kolla/docker/mistral/mistral-base/Dockerfile.j2
new file mode 100644
index 000000000..1d72c1cac
--- /dev/null
+++ b/kolla/docker/mistral/mistral-base/Dockerfile.j2
@@ -0,0 +1,38 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block mistral_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='mistral') }}
+
+ADD mistral-base-archive /mistral-base-source
+ADD plugins-archive /
+
+{% set mistral_base_pip_packages = [
+    '/mistral',
+    'redis'
+] %}
+
+{% set mistral_base_plugins_pip_packages = [
+    '/plugins/*'
+] %}
+
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN ln -s mistral-base-source/* mistral \
+    && {{ macros.install_pip(mistral_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/mistral \
+    && cp -r /mistral/etc/* /etc/mistral/ \
+    && if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(mistral_base_plugins_pip_packages) }}; \
+       fi \
+    && touch /usr/local/bin/kolla_mistral_extend_start \
+    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block mistral_base_footer %}{% endblock %}
diff --git a/kolla/docker/mistral/mistral-base/extend_start.sh b/kolla/docker/mistral/mistral-base/extend_start.sh
new file mode 100644
index 000000000..ac2980d6c
--- /dev/null
+++ b/kolla/docker/mistral/mistral-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/mistral" ]]; then
+    mkdir -p /var/log/kolla/mistral
+fi
+if [[ $(stat -c %a /var/log/kolla/mistral) != "755" ]]; then
+    chmod 755 /var/log/kolla/mistral
+fi
+
+. /usr/local/bin/kolla_mistral_extend_start
diff --git a/kolla/docker/mistral/mistral-engine/Dockerfile.j2 b/kolla/docker/mistral/mistral-engine/Dockerfile.j2
new file mode 100644
index 000000000..c5fd5eb0d
--- /dev/null
+++ b/kolla/docker/mistral/mistral-engine/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block mistral_engine_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block mistral_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER mistral
diff --git a/kolla/docker/mistral/mistral-event-engine/Dockerfile.j2 b/kolla/docker/mistral/mistral-event-engine/Dockerfile.j2
new file mode 100644
index 000000000..2a05ecf76
--- /dev/null
+++ b/kolla/docker/mistral/mistral-event-engine/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block mistral_event_engine_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block mistral_event_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER mistral
diff --git a/kolla/docker/mistral/mistral-executor/Dockerfile.j2 b/kolla/docker/mistral/mistral-executor/Dockerfile.j2
new file mode 100644
index 000000000..aeae9ed06
--- /dev/null
+++ b/kolla/docker/mistral/mistral-executor/Dockerfile.j2
@@ -0,0 +1,15 @@
+FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block mistral_executor_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
+{% block mistral_executor_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER mistral