From 8f72790b4cfcfbec940aca760ddf017b421ec981 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:38:56 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I0c197dbe8e0f71f273e3f2dcd9935c78d3044e26 --- defaults/main.yml | 7 ------- tasks/glance_install.yml | 5 +---- vars/debian.yml | 4 ---- vars/distro_install.yml | 3 --- vars/redhat.yml | 5 ----- vars/source_install.yml | 3 --- 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f30fefeb..1174dc89 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -150,10 +150,6 @@ glance_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default( glance_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" glance_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" -## (Qdrouterd) integration -# TODO(ansmith): Change structure when more backends will be supported -glance_oslomsg_amqp1_enabled: "{{ glance_oslomsg_rpc_transport == 'amqp' }}" - ## Database info glance_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" glance_db_setup_python_interpreter: >- @@ -304,9 +300,6 @@ glance_pip_packages: # Specific pip packages provided by the user glance_user_pip_packages: [] -glance_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - glance_api_init_overrides: {} # With enabled uwsgi glance has broken functionality of diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml index 2f2b8fb2..b6ea351e 100644 --- a/tasks/glance_install.yml +++ b/tasks/glance_install.yml @@ -129,10 +129,7 @@ venv_install_destination_path: "{{ glance_bin | dirname }}" venv_install_distro_package_list: "{{ glance_distro_packages }}" venv_pip_install_args: "{{ glance_pip_install_args }}" - venv_pip_packages: >- - {{ glance_pip_packages | - union(glance_user_pip_packages) | - union(((glance_oslomsg_amqp1_enabled | bool) | ternary(glance_optional_oslomsg_amqp1_pip_packages, []))) }} + venv_pip_packages: "{{ glance_pip_packages | union(glance_user_pip_packages) }}" venv_facts_when_changed: - section: "glance" option: "venv_tag" diff --git a/vars/debian.yml b/vars/debian.yml index a1e327ba..fac18664 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -32,8 +32,4 @@ glance_service_distro_packages: - python3-glance - python3-systemd -glance_oslomsg_amqp1_distro_packages: - - libsasl2-modules - - sasl2-bin - glance_core_files: "{{ _glance_core_files }}" diff --git a/vars/distro_install.yml b/vars/distro_install.yml index e013fd31..3a6a6b0a 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -15,9 +15,6 @@ glance_package_list: |- {% set packages = glance_distro_packages + glance_service_distro_packages %} - {% if glance_oslomsg_amqp1_enabled | bool %} - {% set _ = packages.extend(glance_oslomsg_amqp1_distro_packages) %} - {% endif %} {{ packages }} _glance_bin: "/usr/bin" diff --git a/vars/redhat.yml b/vars/redhat.yml index 8929184b..7883802e 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -28,9 +28,4 @@ glance_service_distro_packages: - openstack-glance - python3-systemd -glance_oslomsg_amqp1_distro_packages: - - cyrus-sasl-lib - - cyrus-sasl-plain - - cyrus-sasl-md5 - glance_core_files: "{{ (glance_install_method == 'source') | ternary(_glance_core_files, []) }}" diff --git a/vars/source_install.yml b/vars/source_install.yml index f3a61c47..fadc2355 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -15,9 +15,6 @@ glance_package_list: |- {% set packages = glance_distro_packages %} - {% if glance_oslomsg_amqp1_enabled | bool %} - {% set _ = packages.extend(glance_oslomsg_amqp1_distro_packages) %} - {% endif %} {{ packages }} _glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"