summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.rst1
-rw-r--r--doc/source/matrix_aarch64.csv1
-rw-r--r--doc/source/matrix_x86.csv1
-rw-r--r--docker/rally/Dockerfile.j259
-rw-r--r--docker/rally/extend_start.sh17
-rwxr-xr-xkolla/common/config.py11
-rwxr-xr-xkolla/image/build.py1
-rw-r--r--releasenotes/notes/remove-rally-image-249782f1a1123b71.yaml5
-rw-r--r--roles/kolla-build-config/defaults/main.yml1
-rwxr-xr-xtools/version-check.py2
10 files changed, 6 insertions, 93 deletions
diff --git a/README.rst b/README.rst
index d61ff143b..c4c56c5cd 100644
--- a/README.rst
+++ b/README.rst
@@ -93,7 +93,6 @@ Kolla provides images to deploy the following OpenStack projects:
- `Neutron <https://docs.openstack.org/neutron/latest/>`__
- `Nova <https://docs.openstack.org/nova/latest/>`__
- `Octavia <https://docs.openstack.org/octavia/latest/>`__
-- `Rally <https://docs.openstack.org/rally/latest/>`__ [deprecated]
- `Sahara <https://docs.openstack.org/sahara/latest/>`__
- `Senlin <https://docs.openstack.org/senlin/latest/>`__
- `Solum <https://docs.openstack.org/solum/latest/>`__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 1f7e9fac9..e1a92088b 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -57,7 +57,6 @@ placement,C,C,N,C,N,C
prometheus,C,C,C,C,N,C
qdrouterd,C,C,C,C,N,N
rabbitmq,C,C,C,C,N,C
-rally (deprecated),C,C,N,C,N,C
redis,C,C,C,C,N,C
sahara,C,C,C,C,N,C
senlin,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index ff7dd6a19..0fead393b 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -58,7 +58,6 @@ placement,T,T,T,T,C,T
prometheus,C,C,C,C,C,C
qdrouterd,C,C,N,N,N,N
rabbitmq,T,T,T,T,C,T
-rally (deprecated),C,C,N,C,C,C
redis,C,T,C,C,C,C
sahara,C,C,C,C,C,C
senlin,C,C,C,C,C,C
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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index a14055100..56887b398 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -106,7 +106,6 @@ _PROFILE_OPTS = [
'monasca',
'murano',
'octavia',
- 'rally',
'redis',
'sahara',
'senlin',
@@ -641,14 +640,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/watcher-tempest-plugin/'
'watcher-tempest-plugin-2.2.0.tar.gz')},
- 'rally': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/rally/'
- 'rally-3.2.0.tar.gz')},
- 'rally-plugin-openstack': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/rally-openstack/'
- 'rally-openstack-2.1.0.tar.gz')},
'sahara-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/sahara/'
@@ -875,7 +866,7 @@ USERS = {
'uid': 42439,
'gid': 42439,
},
- 'rally-user': {
+ 'rally-user': { # unused user (rally dropped)
'uid': 42440,
'gid': 42440,
},
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 0e76ac919..095d2ee6a 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -147,7 +147,6 @@ UNBUILDABLE_IMAGES = {
'ubuntu+binary': {
"cloudkitty-base",
"ironic-neutron-agent",
- "rally",
"senlin-conductor", # no binary package
"senlin-health-manager", # no binary package
"tacker-base",
diff --git a/releasenotes/notes/remove-rally-image-249782f1a1123b71.yaml b/releasenotes/notes/remove-rally-image-249782f1a1123b71.yaml
new file mode 100644
index 000000000..ed48727c2
--- /dev/null
+++ b/releasenotes/notes/remove-rally-image-249782f1a1123b71.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The ``Rally`` project is not a service of OpenStack but its client.
+ Its images and support are removed since Xena cycle.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index b88aa2b9e..81a2ec15c 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -57,7 +57,6 @@ kolla_build_sources:
- neutron-base-plugin-vpnaas-agent
openstack/nova: nova-base
openstack/octavia: octavia-base
- openstack/rally: rally
openstack/sahara: sahara-base
openstack/senlin: senlin-base
openstack/solum: solum-base
diff --git a/tools/version-check.py b/tools/version-check.py
index d200ffdc1..7c5cd28c4 100755
--- a/tools/version-check.py
+++ b/tools/version-check.py
@@ -42,7 +42,6 @@ TARGET = '.releases'
SKIP_PROJECTS = {
'gnocchi-base': 'Gnocchi is not managed by openstack/releases project',
'monasca-thresh': 'Package not published in tarballs.openstack.org',
- 'rally': 'Rally is not managed by openstack/releases project',
}
# NOTE(hrw): those projects we take as they are they may have just one old
@@ -62,7 +61,6 @@ ALWAYS_USE_VERSION_PROJECTS = {
'murano-tempest-plugin',
'neutron-tempest-plugin',
'python-tempestconf',
- 'rally-openstack',
'telemetry_tempest_plugin',
'patrole',
'trove_tempest_plugin',
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 18:47:53 +0000