Browse Source

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
(cherry picked from commit 48b81b8693)
changes/74/760574/2
Bartosz Bezak 2 years ago
parent
commit
19e8efb1ce
  1. 11
      docker/rally/Dockerfile.j2
  2. 4
      kolla/common/config.py
  3. 4
      releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml

11
docker/rally/Dockerfile.j2

@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set rally_packages = [
'openstack-rally',
'openstack-rally-plugins',
'python3-os-testr'
] %}
{% elif base_package_type == 'deb' %}
@ -26,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

4
kolla/common/config.py

@ -748,6 +748,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/rally/'
'rally-3.1.0.tar.gz')},
'rally-plugin-openstack': {
'type': 'url',
'location': ('$tarballs_base/openstack/rally-openstack/'
'rally-openstack-2.0.0.tar.gz')},
'sahara-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/sahara/'

4
releasenotes/notes/rally-openstack-source-62f3ac8f156fc758.yaml

@ -0,0 +1,4 @@
---
fixes:
- |
Added rally-openstack as plugin to rally source image
Loading…
Cancel
Save