openstack/openstack-ansible-os_octavia
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: I49f9f32ca58d061819e27307db77402b63391bc3
This commit is contained in:
Jonathan Rosser 2025-01-06 10:52:54 +00:00 committed by Dmitriy Rabotyagov
parent 40b8a2e0e2
commit 2e890373d2
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -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_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
octavia_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | 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_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
## octavia User / Group ## octavia User / Group
@ -231,9 +227,6 @@ octavia_pip_packages:
# Specific pip packages provided by the user # Specific pip packages provided by the user
octavia_user_pip_packages: [] octavia_user_pip_packages: []
octavia_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]
octavia_optional_ovn_octavia_provider_pip_packages: 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" - "git+{{ octavia_ovn_octavia_provider_git_repo }}@{{ octavia_ovn_octavia_provider_git_install_branch }}#egg=ovn-octavia-provider"

13
vars/main.yml
View File

@ -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_oslomsg_notify_vhost, octavia_oslomsg_notify_vhost | selectattr('state', 'eq', 'present') | map(attribute='name') | first)
}} }}
_octavia_venv_packages: >- _octavia_venv_packages: |-
{%- set pkg_list = octavia_pip_packages | union(octavia_user_pip_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 %}
{%- if octavia_ovn_enabled %} {% set _ = pkg_list.extend(octavia_optional_ovn_octavia_provider_pip_packages) %}
{%- set _ = pkg_list.extend(octavia_optional_ovn_octavia_provider_pip_packages) %} {% endif %}
{%- endif %} {{ pkg_list | unique }}
{{- pkg_list | unique }}
# #
# Compile a list of the services on a host based on whether # Compile a list of the services on a host based on whether