Merge "rally: add rally-openstack in source - follow up" into stable/ussuri
This commit is contained in:
commit
5d4492d4cb
|
@ -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
|
||||
|
|
|
@ -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/'
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Added rally-openstack as plugin to rally source image
|
Loading…
Reference in New Issue