diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2016-07-24 22:16:51 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2016-07-25 19:20:46 +0100 |
| commit | c5149a017da04a6121b74498a454bb7d9881fb59 (patch) | |
| tree | bdec5c78d13496277511b89809e8099ed54ac413 /docker | |
| parent | 0ff90a6f10494f9f33d665a3367dfaf0486b94df (diff) | |
| download | kolla-c5149a017da04a6121b74498a454bb7d9881fb59.tar.gz kolla-c5149a017da04a6121b74498a454bb7d9881fb59.zip | |
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 <dabarren@gmail.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 5d6aa0e1e..e97e13174 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -1,21 +1,18 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} -{% 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 +{% import "macros.j2" as macros with context %} - {% elif base_distro in ['ubuntu'] %} +{% if install_type == 'binary' %} -RUN apt-get -y install --no-install-recommends \ - rally \ - && apt-get clean +{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% set rally_packages = ['openstack-rally'] %} +RUN useradd --user-group rally - {% 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 |