From a6092c35b46bc45ce65f30f377f12552b05b301e Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:38:13 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I5b0ab984337f097861a23f2db90041d5a3557972 --- defaults/main.yml | 7 ------- tasks/designate_install.yml | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a15e026..c3cb450 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -137,10 +137,6 @@ designate_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | defau designate_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" designate_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" -## (Qdrouterd) info -# TODO(ansmith): Change structure when more backends will be supported -designate_oslomsg_amqp1_enabled: "{{ designate_oslomsg_rpc_transport == 'amqp' }}" - ## DNS Backend Configuration # Configuration for the DNS backend that Designate will talk to, Designate # supports lots of backends, bind9, powerdns, nsd, djb, dyn, akamai, etc. @@ -234,9 +230,6 @@ designate_pip_packages: - warlock designate_user_pip_packages: [] -designate_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - designate_central_init_overrides: {} designate_worker_init_overrides: {} designate_producer_init_overrides: {} diff --git a/tasks/designate_install.yml b/tasks/designate_install.yml index 8d1543e..7ed833f 100644 --- a/tasks/designate_install.yml +++ b/tasks/designate_install.yml @@ -46,10 +46,7 @@ venv_build_distro_package_list: "{{ designate_devel_distro_packages }}" venv_install_destination_path: "{{ designate_bin | dirname }}" venv_pip_install_args: "{{ designate_pip_install_args }}" - venv_pip_packages: >- - {{ designate_pip_packages | - union(designate_user_pip_packages) | - union(((designate_oslomsg_amqp1_enabled | bool) | ternary(designate_optional_oslomsg_amqp1_pip_packages, []))) }} + venv_pip_packages: "{{ designate_pip_packages | union(designate_user_pip_packages) }}" venv_facts_when_changed: - section: "designate" option: "venv_tag"