diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-27 17:56:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-27 17:56:04 +0000 |
| commit | d3c7c08062979ae41fc061c61d29ae9d51c56bb2 (patch) | |
| tree | b1e4ef1e35eaf9b244147f0e1ecd09f4277630a1 | |
| parent | 3f065d8171050befa82c1090ffb2f63fe9ccd166 (diff) | |
| parent | c5149a017da04a6121b74498a454bb7d9881fb59 (diff) | |
| download | kolla-d3c7c08062979ae41fc061c61d29ae9d51c56bb2.tar.gz kolla-d3c7c08062979ae41fc061c61d29ae9d51c56bb2.zip | |
Merge "Customizations for rally"
| -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 |