From 584d2a0104fba7cfce5a850ec88cf38c48b69980 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Mon, 6 Jan 2025 10:36:50 +0000
Subject: [PATCH] Remove support for amqp1

Support is removed in oslo.messaging so we remove support in
openstack-ansible roles.

Change-Id: Ibb9758515e02e318ff58939516cb298ca55725d7
---
 defaults/main.yml               | 7 -------
 tasks/cinder_install_source.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 e5174255..eae35017 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -133,10 +133,6 @@ cinder_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(
 cinder_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
 cinder_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
 
-## (Qdrouterd) integration
-# TODO(evrardjp): Change structure when more backends will be supported
-cinder_oslomsg_amqp1_enabled: "{{ cinder_oslomsg_rpc_transport == 'amqp' }}"
-
 ## Coordintation
 cinder_coordination_driver: "{{ coordination_driver | default('zookeeper') }}"
 cinder_coordination_group: "{{ coordination_host_group | default('zookeeper_all') }}"
@@ -345,9 +341,6 @@ cinder_pip_packages:
 # Specific pip packages provided by the user
 cinder_user_pip_packages: []
 
-cinder_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 cinder_api_init_overrides: {}
 cinder_scheduler_init_overrides: {}
 cinder_volume_init_overrides: {}
diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml
index d2bcd30f..a0cf94a8 100644
--- a/tasks/cinder_install_source.yml
+++ b/tasks/cinder_install_source.yml
@@ -22,10 +22,7 @@
     venv_build_distro_package_list: "{{ cinder_devel_distro_packages }}"
     venv_install_destination_path: "{{ cinder_bin | dirname }}"
     venv_pip_install_args: "{{ cinder_pip_install_args }}"
-    venv_pip_packages: >-
-      {{ cinder_pip_packages |
-           union(cinder_user_pip_packages) |
-             union(((cinder_oslomsg_amqp1_enabled | bool) | ternary(cinder_optional_oslomsg_amqp1_pip_packages, []))) }}
+    venv_pip_packages: "{{ cinder_pip_packages | union(cinder_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "cinder"
         option: "need_service_restart"
diff --git a/vars/debian.yml b/vars/debian.yml
index f37f1053..1795d0f1 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -64,7 +64,3 @@ cinder_backup_distro_packages:
   - open-iscsi
   - nfs-common
   - rpcbind
-
-cinder_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 89d3a72f..fe9b7b76 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -34,9 +34,6 @@ cinder_package_list: |-
   {%   set _ = packages.extend(cinder_backup_distro_packages) %}
   {%   set _ = packages.extend(cinder_backup_service_distro_packages) %}
   {% endif %}
-  {% if cinder_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages | unique }}
 
 _cinder_bin: "/usr/bin"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 60947652..41e77e1a 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -59,8 +59,3 @@ cinder_backup_distro_packages:
   - iscsi-initiator-utils
   - nfs-utils
   - rpcbind
-
-cinder_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-lib
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5
diff --git a/vars/source_install.yml b/vars/source_install.yml
index a700de21..bc542e40 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -29,9 +29,6 @@ cinder_package_list: |-
   {% if cinder_services['cinder-backup']['group'] in group_names %}
   {%   set _ = packages.extend(cinder_backup_distro_packages) %}
   {% endif %}
-  {% if cinder_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages | unique }}
 
 _cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"