From 82e1741477d51a5ae3d21180c59855feb91d379f Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:40:45 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I5d8a0e8752a403004aa3166e613081583449b259 --- defaults/main.yml | 11 ----------- vars/main.yml | 3 --- 2 files changed, 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9eec3359..e0c60578 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -323,13 +323,6 @@ ironic_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default( ironic_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" ironic_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 -ironic_oslomsg_amqp1_enabled: "{{ ironic_oslomsg_rpc_transport == 'amqp' }}" - -ironic_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - # Auth ironic_service_user_name: "ironic" @@ -544,10 +537,6 @@ ironic_inspector_oslomsg_notify_vhost: "{{ ironic_inspector_oslomsg_rpc_vhost }} ironic_inspector_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}" ironic_inspector_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}" -ironic_inspector_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] -ironic_inspector_oslomsg_amqp1_enabled: True - ### ### Backend TLS ### diff --git a/vars/main.yml b/vars/main.yml index 7dc8876d..1c387d48 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -343,9 +343,6 @@ filtered_ironic_drivers: |- ironic_venv_packages: |- {%- set pkg_list = ironic_pip_packages %} {%- set _ = pkg_list.extend(ironic_user_pip_packages) %} - {%- if (ironic_oslomsg_amqp1_enabled | bool) %} - {%- set _ = pkg_list.extend(ironic_optional_oslomsg_amqp1_pip_packages) %} - {%- endif %} {%- set _ = pkg_list.extend(ironic_inspector_pip_packages) %} {%- set _ = pkg_list.extend(ironic_inspector_user_pip_packages) %} {{- pkg_list | unique }}