From ed2595a0d4b8484e5acd1bff2f0c04b2d2af4f4f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 30 Jul 2018 12:50:07 +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: If49da70b8b9768d48c09b8fcfca734c9531f1181 --- defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6a2b99d..44d7990 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -92,8 +92,9 @@ magnum_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit' magnum_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" magnum_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" -magnum_oslomsg_notify_userid: magnum -magnum_oslomsg_notify_vhost: /magnum +magnum_oslomsg_notify_userid: "{{ magnum_oslomsg_rpc_userid }}" +magnum_oslomsg_notify_password: "{{ magnum_oslomsg_rpc_password }}" +magnum_oslomsg_notify_vhost: "{{ magnum_oslomsg_rpc_vhost }}" # Keystone AuthToken/Middleware magnum_keystone_auth_plugin: password