From 2e890373d2e4d22a859b6569cc938c08493dffe6 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:52:54 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I49f9f32ca58d061819e27307db77402b63391bc3 --- defaults/main.yml | 7 ------- vars/main.yml | 13 ++++++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4f23c04c..a4f40fe2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -150,10 +150,6 @@ octavia_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default octavia_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" octavia_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 -octavia_oslomsg_amqp1_enabled: "{{ octavia_oslomsg_rpc_transport == 'amqp' }}" - octavia_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" ## octavia User / Group @@ -231,9 +227,6 @@ octavia_pip_packages: # Specific pip packages provided by the user octavia_user_pip_packages: [] -octavia_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - octavia_optional_ovn_octavia_provider_pip_packages: - "git+{{ octavia_ovn_octavia_provider_git_repo }}@{{ octavia_ovn_octavia_provider_git_install_branch }}#egg=ovn-octavia-provider" diff --git a/vars/main.yml b/vars/main.yml index 2c314125..1cee33b3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -31,13 +31,12 @@ _octavia_oslomsg_notify_vhost_conf: >- octavia_oslomsg_notify_vhost, octavia_oslomsg_notify_vhost | selectattr('state', 'eq', 'present') | map(attribute='name') | first) }} -_octavia_venv_packages: >- - {%- set pkg_list = octavia_pip_packages | union(octavia_user_pip_packages) + - (octavia_oslomsg_amqp1_enabled | bool) | ternary(octavia_optional_oslomsg_amqp1_pip_packages, []) %} - {%- if octavia_ovn_enabled %} - {%- set _ = pkg_list.extend(octavia_optional_ovn_octavia_provider_pip_packages) %} - {%- endif %} - {{- pkg_list | unique }} +_octavia_venv_packages: |- + {% set pkg_list = octavia_pip_packages | union(octavia_user_pip_packages) %} + {% if octavia_ovn_enabled %} + {% set _ = pkg_list.extend(octavia_optional_ovn_octavia_provider_pip_packages) %} + {% endif %} + {{ pkg_list | unique }} # # Compile a list of the services on a host based on whether