Merge "Add keystone control exchange"

ceilometer/identity/notifications.py

@@ -0,0 +1,25 @@
+# Copyright 2014 Mirantis Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from oslo.config import cfg
+
+OPTS = [
+    cfg.StrOpt('keystone_control_exchange',
+               default='keystone',
+               help="Exchange name for Keystone notifications."),
+]
+
+
+cfg.CONF.register_opts(OPTS)

ceilometer/profiler/notifications.py

@@ -13,12 +13,18 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.config import cfg
 import oslo.messaging
 
 from ceilometer import plugin
 from ceilometer import sample
 
 
+# TODO(boris-42): remove after adding keystone audit plugins.
+cfg.CONF.import_opt('keystone_control_exchange',
+                    'ceilometer.identity.notifications')
+
+
 class ProfilerNotifications(plugin.NotificationBase):
 
     event_types = ["profiler.*"]
@@ -35,7 +41,8 @@ class ProfilerNotifications(plugin.NotificationBase):
             conf.cinder_control_exchange,
             conf.glance_control_exchange,
             conf.neutron_control_exchange,
-            conf.heat_control_exchange
+            conf.heat_control_exchange,
+            conf.keystone_control_exchange
         ]
 
         for exchange in exchanges: