diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-21 14:17:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-21 14:17:40 +0000 |
| commit | 7de35786d2ecc985ad1c94bc9db7b2566048bf9e (patch) | |
| tree | 57a3fddcb5f035b566483c34c9be504b430bff0c /docker | |
| parent | 8ec8ef3d8a1a852187bbaf4b592f0739e2796abd (diff) | |
| parent | e6cea7b93df7b60619c1348f18356579bf4e0946 (diff) | |
| download | kolla-7de35786d2ecc985ad1c94bc9db7b2566048bf9e.tar.gz kolla-7de35786d2ecc985ad1c94bc9db7b2566048bf9e.zip | |
Merge "Remove rally"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 59 | ||||
| -rw-r--r-- | docker/rally/extend_start.sh | 17 |
2 files changed, 0 insertions, 76 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 deleted file mode 100644 index a3ab3730f..000000000 --- a/docker/rally/Dockerfile.j2 +++ /dev/null @@ -1,59 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -# rally image is deprecated - -{% block rally_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['powertools']) }} -{{ macros.configure_user(name='rally') }} - -{% if install_type == 'binary' %} - -{% if base_package_type == 'rpm' %} - {% set rally_packages = [ - 'openstack-rally', - 'openstack-rally-plugins', - 'python3-os-testr' - ] %} -{% elif base_package_type == 'deb' %} - {% set rally_packages = [ - 'python3-os-testr', - 'rally' - ] %} -{% endif %} -{{ macros.install_packages(rally_packages | customizable("packages")) }} -{% 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 \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(rally_plugins_pip_packages) }}; \ - fi -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block rally_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER rally diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh deleted file mode 100644 index 14d98c6dd..000000000 --- a/docker/rally/extend_start.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -echo "rally image is deprecated" - -if [[ ! -d "/var/log/kolla/rally" ]]; then - mkdir -p /var/log/kolla/rally -fi -if [[ $(stat -c %a /var/log/kolla/rally) != "755" ]]; then - chmod 755 /var/log/kolla/rally -fi - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - rally db create || rally db upgrade - exit 0 -fi |