From 773ec9c79b7601dc85720b7f7e69345f5fef5e83 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Mon, 18 Jul 2016 10:49:20 -0400 Subject: [PATCH] Support service-specific rabbitmq clusters All rabbitmq connection vars are now namespaced. Namespace support was previously inconsistent which limited deployer override options. Change-Id: Ifa6bc7a68a02b48c6a364266c542702b5c043bb0 Implements: blueprint multi-rabbitmq-clusters --- defaults/main.yml | 3 +++ templates/magnum.conf.j2 | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3fc6666..f32bbb4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -66,6 +66,9 @@ magnum_galera_user: magnum magnum_rpc_backend: rabbit magnum_rabbitmq_userid: magnum magnum_rabbitmq_vhost: /magnum +magnum_rabbitmq_servers: 127.0.0.1 +magnum_rabbitmq_use_ssl: False +magnum_rabbitmq_port: 5672 # Keystone AuthToken/Middleware magnum_keystone_auth_plugin: password diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 4820d9e..e09bd27 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -47,8 +47,9 @@ endpoint_type = internalURL endpoint_type = internalURL [oslo_messaging_rabbit] -rabbit_hosts = {{ rabbitmq_servers }} -rabbit_use_ssl = {{ rabbitmq_use_ssl }} +rabbit_port = {{ magnum_rabbitmq_port }} +rabbit_hosts = {{ magnum_rabbitmq_servers }} +rabbit_use_ssl = {{ magnum_rabbitmq_use_ssl }} rabbit_userid = {{ magnum_rabbitmq_userid }} rabbit_password = {{ magnum_rabbitmq_password }} rabbit_virtual_host = {{ magnum_rabbitmq_vhost }}