openstack/openstack-ansible-os_trove
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: I4171afffa496aca00e9892b596ac85d2e978665b
This commit is contained in:
Jonathan Rosser
2025-01-06 10:54:04 +00:00
parent 9a73e4a0b8
commit 7efed51b5a
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@@ -173,10 +173,6 @@ trove_guest_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient
trove_guest_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(trove_guest_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}" trove_guest_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(trove_guest_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
trove_guest_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(trove_guest_oslomsg_rabbit_quorum_queues) }}" trove_guest_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(trove_guest_oslomsg_rabbit_quorum_queues) }}"
## Qdrouterd integration
# TODO(ansmith): Change structure when more backends will be supported
trove_oslomsg_amqp1_enabled: "{{ trove_oslomsg_rpc_transport == 'amqp' }}"
# Specific pip packages provided by the user # Specific pip packages provided by the user
trove_user_pip_packages: [] trove_user_pip_packages: []
@@ -339,9 +335,6 @@ trove_pip_packages:
# Memcached override # Memcached override
trove_memcached_servers: "{{ memcached_servers }}" trove_memcached_servers: "{{ memcached_servers }}"
trove_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]
## Tunable overrides ## Tunable overrides
trove_config_overrides: {} trove_config_overrides: {}
trove_api_paste_ini_overrides: {} trove_api_paste_ini_overrides: {}

3
tasks/main.yml
View File

@@ -150,8 +150,7 @@
venv_install_destination_path: "{{ trove_bin | dirname }}" venv_install_destination_path: "{{ trove_bin | dirname }}"
venv_install_distro_package_list: "{{ trove_distro_packages }}" venv_install_distro_package_list: "{{ trove_distro_packages }}"
venv_pip_install_args: "{{ trove_pip_install_args }}" venv_pip_install_args: "{{ trove_pip_install_args }}"
venv_pip_packages: "{{ trove_pip_packages | union(trove_user_pip_packages) + venv_pip_packages: "{{ trove_pip_packages | union(trove_user_pip_packages) }}"
(trove_oslomsg_amqp1_enabled | bool) | ternary(trove_optional_oslomsg_amqp1_pip_packages, []) }}"
venv_facts_when_changed: venv_facts_when_changed:
- section: "trove" - section: "trove"
option: "venv_tag" option: "venv_tag"