diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-26 10:37:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-26 10:37:49 +0000 |
| commit | 0954877b71e09485557ff372b3aa37eface9dd0d (patch) | |
| tree | a09cd015c32ed6c3dcc6d31389e329404f08ffb5 /docker/rally | |
| parent | 357eeadce441e770a0bd691e18be165e784cb62a (diff) | |
| parent | aa7c7d5279d31020c60198f657c9438bc01ac7e0 (diff) | |
| download | kolla-0954877b71e09485557ff372b3aa37eface9dd0d.tar.gz kolla-0954877b71e09485557ff372b3aa37eface9dd0d.zip | |
Merge "Fix rally create verifier error"
Diffstat (limited to 'docker/rally')
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 9f5075ced..eb08ae55a 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -10,9 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set rally_packages = ['openstack-rally'] %} + {% set rally_packages = [ + 'openstack-rally', + 'python-os-testr' + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set rally_packages = ['rally'] %} + {% set rally_packages = [ + 'python-rally', + 'python-os-testr' + ] %} {% endif %} {{ macros.install_packages(rally_packages | customizable("packages")) }} {% elif install_type == 'source' %} @@ -20,7 +26,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ADD rally-archive /rally-source {% set rally_pip_packages = [ - '/rally' + '/rally', + 'os-testr' ] %} RUN ln -s rally-source/* rally \ |