From 84170d8491391f295ff19a360c0d51a027f7f9ac Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 3 May 2024 19:38:12 +0200 Subject: [PATCH] Add service policies defenition In order to allow definition of policies per service, we need to add variables to service roles, that will be passed to openstack.osa.mq_setup. Currently this can be handled by leveraging group_vars and overriding `oslomsg_rpc_policies` as a whole, but it's not obvious and can be non-trivial for some groups which are co-locating multiple services or in case of metal deployments. Change-Id: Ia7bb2a6ddd3ccdf887ca514ff6b03f41fb8af612 --- defaults/main.yml | 2 ++ tasks/main.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 08334df0..d0f19b5d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -282,6 +282,7 @@ ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" ironic_oslomsg_rpc_userid: ironic +ironic_oslomsg_rpc_policies: [] # vhost name depends on value of oslomsg_rabbit_quorum_queues. In case quorum queues # are not used - vhost name will be prefixed with leading `/`. ironic_oslomsg_rpc_vhost: @@ -305,6 +306,7 @@ ironic_oslomsg_notify_password: "{{ ironic_oslomsg_rpc_password }}" ironic_oslomsg_notify_vhost: "{{ ironic_oslomsg_rpc_vhost }}" ironic_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1_2') }}" ironic_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}" +ironic_oslomsg_notify_policies: [] ## RabbitMQ integration ironic_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" diff --git a/tasks/main.yml b/tasks/main.yml index 6334b3f9..338f7730 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -99,11 +99,13 @@ _oslomsg_rpc_password: "{{ ironic_oslomsg_rpc_password }}" _oslomsg_rpc_vhost: "{{ ironic_oslomsg_rpc_vhost }}" _oslomsg_rpc_transport: "{{ ironic_oslomsg_rpc_transport }}" + _oslomsg_rpc_policies: "{{ ironic_oslomsg_rpc_policies }}" _oslomsg_notify_setup_host: "{{ ironic_oslomsg_notify_setup_host }}" _oslomsg_notify_userid: "{{ ironic_oslomsg_notify_userid }}" _oslomsg_notify_password: "{{ ironic_oslomsg_notify_password }}" _oslomsg_notify_vhost: "{{ ironic_oslomsg_notify_vhost }}" _oslomsg_notify_transport: "{{ ironic_oslomsg_notify_transport }}" + _oslomsg_notify_policies: "{{ ironic_oslomsg_notify_policies }}" tags: - always