From 43f4033e41562123bafcb7d6ee6a06bb75ef47a0 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 30 Jul 2018 12:46:45 +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: I9aa597705514a460a6bc57137b7d2d06bf6b7f05 --- defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0f92e90..4a16fd0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -81,8 +81,9 @@ heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" heat_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" -heat_oslomsg_notify_userid: heat -heat_oslomsg_notify_vhost: /heat +heat_oslomsg_notify_userid: "{{ heat_oslomsg_rpc_userid }}" +heat_oslomsg_notify_password: "{{ heat_oslomsg_rpc_password }}" +heat_oslomsg_notify_vhost: "{{ heat_oslomsg_rpc_vhost }}" ## Heat User / Group heat_system_user_name: heat