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

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

Change-Id: I1c3d46cea5380e25d684234779fcbc701a28d844
---
 defaults/main.yml          | 8 --------
 tasks/keystone_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(+), 27 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 1cac8585..1629ad74 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -173,10 +173,6 @@ keystone_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | defaul
 keystone_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
 keystone_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
 
-## (Qdrouterd) info
-# TODO(ansmith): Change structure when more backends will be supported
-keystone_oslomsg_amqp1_enabled: "{{ keystone_oslomsg_rpc_transport == 'amqp' }}"
-
 ## Role info
 keystone_role_name: admin
 
@@ -600,10 +596,6 @@ keystone_pip_packages:
 # Specific pip packages provided by the user
 keystone_user_pip_packages: []
 
-# optional pip packages
-keystone_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 # NOTE(cloudnull): Tunable SSO callback file file-based overrides If defined,
 #                  it'll be read from the deployment host, interpreted by the
 #                  template engine and copied to the target host.
diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml
index 22716a18..02fac980 100644
--- a/tasks/keystone_install.yml
+++ b/tasks/keystone_install.yml
@@ -76,10 +76,7 @@
     venv_build_distro_package_list: "{{ keystone_devel_distro_packages }}"
     venv_install_destination_path: "{{ keystone_bin | dirname }}"
     venv_pip_install_args: "{{ keystone_pip_install_args }}"
-    venv_pip_packages: >-
-      {{ keystone_pip_packages |
-           union(keystone_user_pip_packages) |
-             union(((keystone_oslomsg_amqp1_enabled | bool) | ternary(keystone_optional_oslomsg_amqp1_pip_packages, []))) }}
+    venv_pip_packages: "{{ keystone_pip_packages | union(keystone_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "keystone"
         option: "need_db_expand"
diff --git a/vars/debian.yml b/vars/debian.yml
index 62481710..c90d3cdb 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -62,10 +62,6 @@ keystone_sp_apache_mod_packages:
 keystone_developer_mode_distro_packages:
   - build-essential
 
-keystone_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin
-
 keystone_apache_default_sites:
   - "/etc/apache2/sites-enabled/000-default.conf"
 
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index c0300eaf..c43d8363 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -23,9 +23,6 @@ keystone_package_list: |-
   {% if keystone_idp != {} %}
   {%   set _ = packages.extend(keystone_idp_distro_packages) %}
   {% endif %}
-  {% if keystone_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(keystone_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {% set _ = packages.extend(keystone_service_distro_packages) %}
   {{ packages }}
 
diff --git a/vars/redhat.yml b/vars/redhat.yml
index c5366f16..f602bb06 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -55,11 +55,6 @@ keystone_sp_apache_mod_packages:
 keystone_developer_mode_distro_packages:
   - gcc
 
-keystone_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-lib
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5
-
 keystone_apache_default_sites:
   - "/etc/httpd/conf.d/userdir.conf"
   - "/etc/httpd/conf.d/welcome.conf"
diff --git a/vars/source_install.yml b/vars/source_install.yml
index ade50bd8..92292aef 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -23,9 +23,6 @@ keystone_package_list: |-
   {% if keystone_idp != {} %}
   {%   set _ = packages.extend(keystone_idp_distro_packages) %}
   {% endif %}
-  {% if keystone_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(keystone_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _keystone_bin: "/openstack/venvs/keystone-{{ keystone_venv_tag }}/bin"