Merge "Add support for installing binary packages for senlin"

3 files changed, 25 insertions, 6 deletions

diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2
index 969197ac5..ebc1453c7 100644
--- a/docker/senlin/senlin-api/Dockerfile.j2
+++ b/docker/senlin/senlin-api/Dockerfile.j2
@@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block senlin_api_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+        {% set senlin_api_packages = ['openstack-senlin-api'] %}
+
+    {% elif base_distro in ['debian', 'ubuntu'] %}
+        {% set senlin_api_packages = ['senlin-api'] %}
+    {% endif %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+{{ macros.install_packages(senlin_api_packages | customizable("packages")) }}
 
 {% endif %}
 
diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2
index e2d2c1c59..46f9797d6 100644
--- a/docker/senlin/senlin-base/Dockerfile.j2
+++ b/docker/senlin/senlin-base/Dockerfile.j2
@@ -8,9 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='senlin') }}
 
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+        {% set senlin_base_packages = ['openstack-senlin-common'] %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+    {% elif base_distro in ['debian', 'ubuntu'] %}
+        {% set senlin_base_packages = ['senlin-common'] %}
+    {% endif %}
+
+{{ macros.install_packages(senlin_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2
index 40a08ba05..a31a04146 100644
--- a/docker/senlin/senlin-engine/Dockerfile.j2
+++ b/docker/senlin/senlin-engine/Dockerfile.j2
@@ -3,10 +3,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block senlin_engine_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+        {% set senlin_engine_packages = ['openstack-senlin-engine'] %}
+
+    {% elif base_distro in ['debian', 'ubuntu'] %}
+        {% set senlin_engine_packages = ['senlin-engine'] %}
+    {% endif %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
+{{ macros.install_packages(senlin_engine_packages | customizable("packages")) }}
 
 {% endif %}