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

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

Change-Id: I8ba856cef878c8d7aac2c71a78983c5ee177907e
---
 defaults/main.yml       | 6 ------
 vars/debian.yml         | 4 ----
 vars/distro_install.yml | 3 ---
 vars/main.yml           | 6 ------
 vars/redhat.yml         | 5 -----
 vars/source_install.yml | 3 ---
 6 files changed, 27 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7fe12c40..6c91edff 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -288,12 +288,6 @@ neutron_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TL
 neutron_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
 neutron_oslomsg_notify_policies: []
 
-###
-### (Qdrouterd) integration
-###
-# TODO(evrardjp): Change structure when more backends will be supported
-neutron_oslomsg_amqp1_enabled: "{{ neutron_oslomsg_rpc_transport == 'amqp' }}"
-
 ###
 ### (RabbitMQ) integration
 ###
diff --git a/vars/debian.yml b/vars/debian.yml
index c53978c2..4103ac3d 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -126,7 +126,3 @@ neutron_metadata_agent_distro_packages:
 
 neutron_remove_distro_packages:
   - conntrackd
-
-neutron_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 4675ed1c..017edca6 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -57,9 +57,6 @@ neutron_package_list: |-
   {% if (neutron_services['neutron-ovn-controller']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool) %}
   {% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
   {% endif %}
-  {% if neutron_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {% set _ = packages.extend(neutron_service_distro_packages) %}
   {{ packages }}
 
diff --git a/vars/main.yml b/vars/main.yml
index 15d48d3d..509676e0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -52,9 +52,6 @@ neutron_pip_packages:
 # Specific pip packages provided by the user
 neutron_user_pip_packages: []
 
-neutron_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 neutron_optional_bgp_pip_packages:
   - "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
 
@@ -103,9 +100,6 @@ neutron_venv_packages: >-
   {%- if neutron_sfc | bool %}
   {%-   set _ = pkg_list.extend(neutron_optional_sfc_pip_packages) %}
   {%- endif %}
-  {%- if neutron_oslomsg_amqp1_enabled | bool %}
-  {%-   set _ = pkg_list.extend(neutron_optional_oslomsg_amqp1_pip_packages) %}
-  {%- endif %}
   {%- if (neutron_plugin_type.split('.')[-1] == 'nuage') and
          (neutron_services['neutron-server']['group'] in group_names) %}
   {%-     set _ = pkg_list.extend(neutron_optional_nuage_pip_packages) %}
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 6752351f..039820c0 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -115,8 +115,3 @@ neutron_metadata_agent_distro_packages:
   - haproxy
 
 neutron_remove_distro_packages: []
-
-neutron_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 5d597da2..1ef329d2 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -51,9 +51,6 @@ neutron_package_list: |-
   {% if (neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn') %}
   {% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
   {% endif %}
-  {% if neutron_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"