diff options
| author | Bartosz Bezak <bartosz@stackhpc.com> | 2020-10-16 11:16:14 +0200 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2020-10-16 11:16:14 +0200 |
| commit | 48b81b86939e54044d4fa289f2f9e4e620cf44bc (patch) | |
| tree | d15451d5255cc4358f5003044b9e40b12f213c42 | |
| parent | c26086b1bea35784a10d9b9682b7301175d27603 (diff) | |
| download | kolla-48b81b86939e54044d4fa289f2f9e4e620cf44bc.tar.gz kolla-48b81b86939e54044d4fa289f2f9e4e620cf44bc.zip | |
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
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 10 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml | 4 |
3 files changed, 15 insertions, 3 deletions
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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 8aa17172f..cd3e03ed7 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -719,8 +719,8 @@ SOURCES = { 'rally': { 'type': 'url', 'location': ('$tarballs_base/openstack/rally/' - 'rally-master.tar.gz')}, - 'rally-openstack': { + 'rally-3.1.0.tar.gz')}, + 'rally-plugin-openstack': { 'type': 'url', 'location': ('$tarballs_base/openstack/rally-openstack/' 'rally-openstack-2.0.0.tar.gz')}, diff --git a/releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml b/releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml new file mode 100644 index 000000000..adaf65779 --- /dev/null +++ b/releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Added rally-openstack as plugin to rally source image |