From d0b33c1c504707b52ac2a728a418311df3d3b57f Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:45:36 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I5a7029f3e441e97bed511ece8d56057d669fc139 --- defaults/main.yml | 7 ------- vars/main.yml | 3 --- 2 files changed, 10 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f9ed1bd..b50a69e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -226,13 +226,6 @@ masakari_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | defaul masakari_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" masakari_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 -masakari_oslomsg_amqp1_enabled: "{{ masakari_oslomsg_rpc_transport == 'amqp' }}" - -masakari_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - # The multicast interface used by corocync for masakari hostmonitor masakari_monitor_corosync_multicast_interface: "br-mgmt" masakari_monitor_corosync_multicast_ports: 5405 diff --git a/vars/main.yml b/vars/main.yml index db778d1..3f91d20 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -38,7 +38,4 @@ masakari_pip_venv_packages: |- {% if 'masakari_monitor' in group_names %} {% set _ = pip_packages.extend(masakari_monitor_pip_packages) %} {% endif %} - {% if masakari_oslomsg_amqp1_enabled | bool %} - {% set _ = pip_packages.extend(masakari_optional_oslomsg_amqp1_pip_packages) %} - {% endif %} {{ pip_packages }}