From c5149a017da04a6121b74498a454bb7d9881fb59 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Sun, 24 Jul 2016 22:16:51 +0200 Subject: [PATCH] Customizations for rally This patchset contains customization of Dockerfile of rally containers Change-Id: I8b22525320939dc3235c9fd3af7e04356125c1ca Partially-implements: blueprint third-party-plugin-support Signed-off-by: Eduardo Gonzalez --- docker/rally/Dockerfile.j2 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 5d6aa0e1e2..e97e131740 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -1,21 +1,18 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - openstack-rally \ - && yum clean all \ - && useradd --user-group rally +{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% set rally_packages = ['openstack-rally'] %} +RUN useradd --user-group rally - {% elif base_distro in ['ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - rally \ - && apt-get clean - - {% endif %} +{% elif base_distro in ['ubuntu'] %} + {% set rally_packages = ['rally'] %} +{% endif %} +RUN {{ macros.install_packages(rally_packages | customizable("packages")) }} {% elif install_type == 'source' %} ADD rally-archive /rally-source @@ -28,6 +25,8 @@ RUN ln -s rally-source/* rally \ RUN usermod -a -G kolla rally +{% block rally_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER rally