From 5b577e819e1c0466dc049f722805c8c69294360c Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 6 Jan 2025 10:54:31 +0000 Subject: [PATCH] Remove support for amqp1 Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: Id69e232df4ca40ac5fa5b5ca722188cb52e7bcfe --- defaults/main.yml | 7 ------- tasks/main.yml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c261df5..def093e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -355,15 +355,8 @@ zun_pip_packages: - pymysql - systemd-python -## (Qdrouterd) integration -# TODO(ansmith): Change structure when more backends will be supported -zun_oslomsg_amqp1_enabled: "{{ zun_oslomsg_rpc_transport == 'amqp' }}" - zun_memcached_servers: "{{ memcached_servers }}" -zun_optional_oslomsg_amqp1_pip_packages: - - oslo.messaging[amqp1] - ## Default service options used within all systemd unit files. zun_service_defaults: {} diff --git a/tasks/main.yml b/tasks/main.yml index 006cdf5..8f717fe 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -74,7 +74,7 @@ venv_install_destination_path: "{{ zun_bin | dirname }}" venv_install_distro_package_list: "{{ zun_distro_packages }}" venv_pip_install_args: "{{ zun_pip_install_args }}" - venv_pip_packages: "{{ zun_pip_packages | union((zun_oslomsg_amqp1_enabled | bool) | ternary(zun_optional_oslomsg_amqp1_pip_packages, [])) }}" + venv_pip_packages: "{{ zun_pip_packages }}" venv_facts_when_changed: - section: "zun" option: "venv_tag"