openstack/kolla
Code Issues Proposed changes

Fix rally create verifier error

Browse Source 
rally create verifier(temptest) need os-testr package

Change-Id: Id68304ae4396ab0173f0a25319df2dbef5257662
Closes-Bug: #1693171
This commit is contained in:
zhubingbing 2017-05-25 11:14:21 +08:00
parent 02f136025c
commit aa7c7d5279
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/rally/Dockerfile.j2
View File

@ -10,9 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set rally_packages = ['rally'] %} {% set rally_packages = [
'python-rally',
'python-os-testr'
] %}
{% endif %} {% endif %}
{{ macros.install_packages(rally_packages | customizable("packages")) }} {{ macros.install_packages(rally_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
@ -20,7 +26,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
ADD rally-archive /rally-source ADD rally-archive /rally-source
{% set rally_pip_packages = [ {% set rally_pip_packages = [
'/rally' '/rally',
'os-testr'
] %} ] %}
RUN ln -s rally-source/* rally \ RUN ln -s rally-source/* rally \