From 87bf6822b56ca56cf1913be147f644c7b405a069 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Fri, 1 Aug 2014 02:17:13 -0400 Subject: [PATCH] Update control_exchange value in keystone.conf The control_exchange comes from oslo and is set to 'openstack' by default. This should be overridden by the projects that use oslo.messaging, since projects should be placing notifications on project specific exchanges. Nova performs the override in the same manner: https://github.com/openstack/nova/blob/master/nova/config.py#L33 https://github.com/openstack/nova/blob/master/nova/rpc.py#L77 Change-Id: Ifcc43dcccaa9d56e03922ce8cf0bf7fb8e93bdcc --- etc/keystone.conf.sample | 2 +- keystone/common/config.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index bb4271dcc..ce116f4df 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -307,7 +307,7 @@ # The default exchange under which topics are scoped. May be # overridden by an exchange name specified in the # transport_url option. (string value) -#control_exchange=openstack +#control_exchange=keystone # diff --git a/keystone/common/config.py b/keystone/common/config.py index 91c1e9475..f694c51ed 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -13,6 +13,7 @@ # under the License. from oslo.config import cfg +from oslo import messaging _DEFAULT_AUTH_METHODS = ['external', 'password', 'token'] @@ -796,6 +797,7 @@ FILE_OPTIONS = { CONF = cfg.CONF +messaging.set_transport_defaults(control_exchange='keystone') def setup_authentication(conf=None):