commit 64e5a0162289e40bbcb30888fda778d48e9ba05f
author Jenkins <jenkins@review.openstack.org> Sat Feb 23 19:25:34 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Feb 23 19:25:34 2013 +0000
tree d4600a9da9094ba30acd8d842d6d348d2e79cbac
parent f41024e4b0b39f4b2d5d6bdb4873010f2e625b42
parent d36268af07744a3f4219f3d60a09b67c9e471cf5

Merge "Support qpid as message provider for ceilometer"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index bc37d92..e890ff9 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -64,11 +64,16 @@
     [ ! -d $CEILOMETER_API_LOG_DIR ] &&  sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR
     sudo chown $USER $CEILOMETER_API_LOG_DIR
 
-    iniset $CEILOMETER_CONF DEFAULT rpc_backend 'ceilometer.openstack.common.rpc.impl_kombu'
+    if is_service_enabled rabbit ; then
+        iniset $CEILOMETER_CONF DEFAULT rpc_backend 'ceilometer.openstack.common.rpc.impl_kombu'
+        iniset $CEILOMETER_CONF DEFAULT rabbit_host $RABBIT_HOST
+        iniset $CEILOMETER_CONF DEFAULT rabbit_password $RABBIT_PASSWORD
+    elif is_service_enabled qpid ; then
+        iniset $CEILOMETER_CONF DEFAULT rpc_backend 'ceilometer.openstack.common.rpc.impl_qpid'
+    fi
+
     iniset $CEILOMETER_CONF DEFAULT notification_topics 'notifications,glance_notifications'
     iniset $CEILOMETER_CONF DEFAULT verbose True
-    iniset $CEILOMETER_CONF DEFAULT rabbit_host $RABBIT_HOST
-    iniset $CEILOMETER_CONF DEFAULT rabbit_password $RABBIT_PASSWORD
     iniset $CEILOMETER_CONF DEFAULT sql_connection $BASE_SQL_CONN/nova?charset=utf8
 
     # Install the policy file for the API server