diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-24 17:59:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-24 17:59:45 +0000 |
| commit | 384eb988a4a31cf7539dce426e3b715f5fe8e478 (patch) | |
| tree | 4b3e6c59f23d93e045dc992a211b92aafdb8aea2 | |
| parent | d85b76daf68b8240479e59ec28e84abbf21230e9 (diff) | |
| parent | 8859345f3beca0c037ebd6d3a4eaabe07c6bbd73 (diff) | |
| download | keystonemiddleware-384eb988a4a31cf7539dce426e3b715f5fe8e478.tar.gz | |
Merge "use local config options if available in audit middleware"
| -rw-r--r-- | keystonemiddleware/audit.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1583702-a4469dc1556878b9.yaml | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/keystonemiddleware/audit.py b/keystonemiddleware/audit.py index fd6f9da..5206855 100644 --- a/keystonemiddleware/audit.py +++ b/keystonemiddleware/audit.py @@ -382,13 +382,13 @@ class AuditMiddleware(object): if messaging: transport = oslo_messaging.get_transport( cfg.CONF, - url=cfg.CONF.audit_middleware_notifications.transport_url, + url=self._conf.get('transport_url'), aliases=transport_aliases) self._notifier = oslo_messaging.Notifier( transport, os.path.basename(sys.argv[0]), - driver=cfg.CONF.audit_middleware_notifications.driver, - topics=cfg.CONF.audit_middleware_notifications.topics) + driver=self._conf.get('driver'), + topics=self._conf.get('topics')) def _emit_audit(self, context, event_type, payload): """Emit audit notification. diff --git a/releasenotes/notes/bug-1583702-a4469dc1556878b9.yaml b/releasenotes/notes/bug-1583702-a4469dc1556878b9.yaml new file mode 100644 index 0000000..1669380 --- /dev/null +++ b/releasenotes/notes/bug-1583702-a4469dc1556878b9.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - > + [`bug 1583702 <https://bugs.launchpad.net/keystonemiddleware/+bug/1583702>`_] + Some services such as Swift does not use Oslo (global) config. In that + case, the options are conveyed via local config. This patch utilized + an established pattern in auth_token middleware, which is to first + look for the given option in local config, then Oslo global config. |