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

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

Change-Id: I4171afffa496aca00e9892b596ac85d2e978665b
---
 defaults/main.yml | 7 -------
 tasks/main.yml    | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index dda38a4..95ef681 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -173,10 +173,6 @@ trove_guest_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient
 trove_guest_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(trove_guest_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
 trove_guest_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(trove_guest_oslomsg_rabbit_quorum_queues) }}"
 
-## Qdrouterd integration
-# TODO(ansmith): Change structure when more backends will be supported
-trove_oslomsg_amqp1_enabled: "{{ trove_oslomsg_rpc_transport == 'amqp' }}"
-
 # Specific pip packages provided by the user
 trove_user_pip_packages: []
 
@@ -339,9 +335,6 @@ trove_pip_packages:
 # Memcached override
 trove_memcached_servers: "{{ memcached_servers }}"
 
-trove_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 ## Tunable overrides
 trove_config_overrides: {}
 trove_api_paste_ini_overrides: {}
diff --git a/tasks/main.yml b/tasks/main.yml
index f2e69e9..1b4fa2d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -150,8 +150,7 @@
     venv_install_destination_path: "{{ trove_bin | dirname }}"
     venv_install_distro_package_list: "{{ trove_distro_packages }}"
     venv_pip_install_args: "{{ trove_pip_install_args }}"
-    venv_pip_packages: "{{ trove_pip_packages | union(trove_user_pip_packages) +
-    (trove_oslomsg_amqp1_enabled | bool) | ternary(trove_optional_oslomsg_amqp1_pip_packages, []) }}"
+    venv_pip_packages: "{{ trove_pip_packages | union(trove_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "trove"
         option: "venv_tag"