Merge "Customizations for mistral"

4 files changed, 30 insertions, 43 deletions

diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index c2b3e3ea8..ed90c8b0b 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -1,25 +1,21 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        openstack-mistral-api \
-    && yum clean all
-
+       {% set mistral_api_packages = ['openstack-mistral-api'] %}
     {% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        mistral-api \
-    && apt-get clean
-
+        {% set mistral_api_packages = ['mistral-api'] %}
     {% endif %}
+RUN {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
 RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
 
+{% block mistral_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER mistral
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index 782d31c97..a31286799 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -1,21 +1,16 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-{% if install_type == 'binary' %}
-
-    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        openstack-mistral-common \
-    && yum clean all
+{% import "macros.j2" as macros with context %}
 
-    {% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        mistral-common \
-    && apt-get clean
+{% if install_type == 'binary' %}
 
-    {% endif %}
+{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+    {% set mistral_base_packages = ['openstack-mistral-common'] %}
+{% elif base_distro in ['ubuntu'] %}
+    {% set mistral_base_packages = ['mistral-common'] %}
+{% endif %}
+RUN {{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index 7381290f1..f12f3d868 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-engine/Dockerfile.j2
@@ -1,21 +1,19 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        openstack-mistral-engine \
-    && yum clean all
-
+       {% set mistral_engine_packages = ['openstack-mistral-engine'] %}
     {% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        mistral-engine \
-    && apt-get clean
-
+        {% set mistral_engine_packages = ['mistral-engine'] %}
     {% endif %}
+RUN {{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}
+
 {% endif %}
+{% block mistral_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 
 {{ include_footer }}
 
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index b5b426cdd..3ab176bd7 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/Dockerfile.j2
@@ -1,21 +1,19 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        openstack-mistral-executor \
-    && yum clean all
-
+       {% set mistral_executor_packages = ['openstack-mistral-executor'] %}
     {% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        mistral-executor \
-    && apt-get clean
-
+        {% set mistral_executor_packages = ['mistral-executor'] %}
     {% endif %}
+RUN {{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}
+
 {% endif %}
+{% block mistral_executor_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 
 {{ include_footer }}