From 48b81b86939e54044d4fa289f2f9e4e620cf44bc Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Fri, 16 Oct 2020 11:16:14 +0200
Subject: rally: add rally-openstack in source - follow up

Follow up to change [0]
rally-openstack added as plugin to rally source image.
Changed rally tarball to latest available version,
as rally does not build tarbals from master branch anymore.

[0]: https://review.opendev.org/#/c/757542/
Closes-Bug: #1803968

Change-Id: I26dd3a02e5e0131f52eac1380562b610eea3a36f
---
 docker/rally/Dockerfile.j2 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2
index cdf1da0f0..d72830ae0 100644
--- a/docker/rally/Dockerfile.j2
+++ b/docker/rally/Dockerfile.j2
@@ -27,16 +27,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% elif install_type == 'source' %}
 
 ADD rally-archive /rally-source
+ADD plugins-archive /
 
 {% set rally_pip_packages = [
     '/rally',
     'os-testr'
 ] %}
 
+{% set rally_plugins_pip_packages = [
+    '/plugins/*'
+] %}
+
 RUN ln -s rally-source/* rally \
     && {{ macros.install_pip(rally_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/rally \
-    && chown -R rally: /etc/rally
+    && chown -R rally: /etc/rally \
+    && if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(rally_plugins_pip_packages) }}; \
+    fi
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-- 
cgit v1.2.3