From aff00f016bf1b2205c4ff20ef94c73cd931eeff4 Mon Sep 17 00:00:00 2001
From: Jeremy Liu <liujiong@gohighsec.com>
Date: Fri, 13 Apr 2018 12:34:25 +0800
Subject: [PATCH] Configure control_exchange to match keystone

keystone is using 'keystone' as default control_exchange [1], barbican needs
to match the value so it could consume related events notifications.

[1] https://github.com/openstack/keystone/blob/master/keystone/conf/__init__.py#L90

Change-Id: I16c0fb7e79545268b058eb6fd1a006a04e3fb61b
---
 barbican/common/config.py                                     | 2 +-
 devstack/lib/barbican                                         | 1 +
 .../change_default_control_exchange-c47abc3e3f08aa31.yaml     | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/change_default_control_exchange-c47abc3e3f08aa31.yaml

diff --git a/barbican/common/config.py b/barbican/common/config.py
index 4a3012ac8..88545ddba 100644
--- a/barbican/common/config.py
+++ b/barbican/common/config.py
@@ -168,7 +168,7 @@ ks_queue_opts = [
     cfg.BoolOpt('enable', default=False,
                 help=u._('True enables keystone notification listener '
                          ' functionality.')),
-    cfg.StrOpt('control_exchange', default='openstack',
+    cfg.StrOpt('control_exchange', default='keystone',
                help=u._('The default exchange under which topics are scoped. '
                         'May be overridden by an exchange name specified in '
                         'the transport_url option.')),
diff --git a/devstack/lib/barbican b/devstack/lib/barbican
index 2e953eb4b..3e5995d7f 100644
--- a/devstack/lib/barbican
+++ b/devstack/lib/barbican
@@ -156,6 +156,7 @@ function configure_barbican {
 
     # Enable the keystone listener
     iniset $BARBICAN_CONF keystone_notifications enable True
+    iniset $BARBICAN_CONF keystone_notifications control_exchange 'keystone'
 }
 
 # init_barbican - Initialize etc.
diff --git a/releasenotes/notes/change_default_control_exchange-c47abc3e3f08aa31.yaml b/releasenotes/notes/change_default_control_exchange-c47abc3e3f08aa31.yaml
new file mode 100644
index 000000000..71a67549d
--- /dev/null
+++ b/releasenotes/notes/change_default_control_exchange-c47abc3e3f08aa31.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - default value of 'control_exchange' in 'barbican.conf'
+    has been changed to 'keystone'.