From 595af4fe6a25e5ceba7870111450d7e7e403ac56 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 30 Jul 2018 12:48:39 +0100 Subject: [PATCH] Default MQ RPC/Notify credentials/vhosts to match When the RPC and Notify service are the same, the credentials must match - otherwise the tasks to create the user/password will overwrite with each other. If the two clusters are different, then the matching credentials and vhost will not be a problem. However, if the deployer really wishes to make sure they're different, then the vars can be overridden. Also, to ensure that the SSL value is consistently set in the conf file, we apply the bool filter. We also use the 'notify' SSL setting as the messaging system for Notifications is more likely to remain rabbitmq in our default deployment with qrouterd becoming the default for RPC messaging. Change-Id: I8e917033595660bf30c0b897f07db1bdfc2ff6d8 --- defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0a2a1f71..d4bb1490 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -235,8 +235,9 @@ ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit' ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" ironic_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" -ironic_oslomsg_notify_userid: ironic -ironic_oslomsg_notify_vhost: /ironic +ironic_oslomsg_notify_userid: "{{ ironic_oslomsg_rpc_userid }}" +ironic_oslomsg_notify_password: "{{ ironic_oslomsg_rpc_password }}" +ironic_oslomsg_notify_vhost: "{{ ironic_oslomsg_rpc_vhost }}" # Auth ironic_service_user_name: "ironic"