From d36268af07744a3f4219f3d60a09b67c9e471cf5 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Fri, 22 Feb 2013 21:59:52 +0000
Subject: [PATCH] Support qpid as message provider for ceilometer

Previously, the RPC backend was hardcoded to the appropriate
dirver for rabbitMQ only.

Now we allow qpid to be used as an alternative.

Note that ZeroMQ is not tested or supported as yet.

Change-Id: If9a69a4c52f046fc6e3530b47542d55438787cea
---
 lib/ceilometer | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/ceilometer b/lib/ceilometer
index bc37d92b60..e890ff9593 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -64,11 +64,16 @@ function configure_ceilometer() {
     [ ! -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