openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for rally"

Browse Source
This commit is contained in:
Jenkins 2016-07-27 17:56:04 +00:00 committed by Gerrit Code Review
commit d3c7c08062
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docker/rally/Dockerfile.j2
View File

@ -1,21 +1,18 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
openstack-rally \ {% set rally_packages = ['openstack-rally'] %}
&& yum clean all \ RUN useradd --user-group rally
&& useradd --user-group rally
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set rally_packages = ['rally'] %}
RUN apt-get -y install --no-install-recommends \ {% endif %}
rally \ RUN {{ macros.install_packages(rally_packages | customizable("packages")) }}
&& apt-get clean
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD rally-archive /rally-source ADD rally-archive /rally-source
@ -28,6 +25,8 @@ RUN ln -s rally-source/* rally \
RUN usermod -a -G kolla rally RUN usermod -a -G kolla rally
{% block rally_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER rally USER rally