openstack/openstack-ansible-os_masakari
Code Issues Proposed changes

Remove support for amqp1

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

Change-Id: I5a7029f3e441e97bed511ece8d56057d669fc139
This commit is contained in:
Jonathan Rosser 2025-01-06 10:45:36 +00:00
parent 0aeda2bb5a
commit d0b33c1c50
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -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_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
masakari_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | 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 # The multicast interface used by corocync for masakari hostmonitor
masakari_monitor_corosync_multicast_interface: "br-mgmt" masakari_monitor_corosync_multicast_interface: "br-mgmt"
masakari_monitor_corosync_multicast_ports: 5405 masakari_monitor_corosync_multicast_ports: 5405

3
vars/main.yml
View File

@ -38,7 +38,4 @@ masakari_pip_venv_packages: |-
{% if 'masakari_monitor' in group_names %} {% if 'masakari_monitor' in group_names %}
{% set _ = pip_packages.extend(masakari_monitor_pip_packages) %} {% set _ = pip_packages.extend(masakari_monitor_pip_packages) %}
{% endif %} {% endif %}
{% if masakari_oslomsg_amqp1_enabled | bool %}
{% set _ = pip_packages.extend(masakari_optional_oslomsg_amqp1_pip_packages) %}
{% endif %}
{{ pip_packages }} {{ pip_packages }}