commit 53a5f42e780535e05c24c75801e122b72339201c
author Doug Hellmann <doug.hellmann@dreamhost.com> Tue Oct 02 17:29:23 2012 -0400
committer Doug Hellmann <doug.hellmann@dreamhost.com> Tue Oct 02 22:26:39 2012 -0400
tree 59f811d7f198969b426d72365eb7a43c9905eec1
parent 08ac8e6d9f124017f94654e37171e760914023ac

Fix ceilometer configuration

Correct the use of NOVA_CONF to find the source file
for the ceilometer configuration files.

Set up notifications and RPC to use the classes from
ceilometer.openstack.common instead of nova.openstack.common.

Run the ceilometer compute agent under "sg libvirtd"
so it has permission to talk to libvirt.

Change-Id: I75b2e563d654f4f89b182e146e54572618f25261
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index bea68ed..10ceb45 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -58,8 +58,11 @@
     sudo chown $USER $CEILOMETER_API_LOG_DIR
 
     # ceilometer confs are copy of /etc/nova/nova.conf which must exist first
-    grep -v format_string $NOVA_CONF_DIR/$NOVA_CONF > $CEILOMETER_AGENT_CONF
-    grep -v format_string $NOVA_CONF_DIR/$NOVA_CONF > $CEILOMETER_COLLECTOR_CONF
+    grep -v format_string $NOVA_CONF > $CEILOMETER_AGENT_CONF
+    iniset $CEILOMETER_AGENT_CONF DEFAULT rpc_backend 'ceilometer.openstack.common.rpc.impl_kombu'
+
+    grep -v format_string $NOVA_CONF > $CEILOMETER_COLLECTOR_CONF
+    iniset $CEILOMETER_COLLECTOR_CONF DEFAULT rpc_backend 'ceilometer.openstack.common.rpc.impl_kombu'
     iniset $CEILOMETER_COLLECTOR_CONF DEFAULT notification_topics 'notifications,glance_notifications'
 }
 
@@ -70,7 +73,7 @@
 
 # start_ceilometer() - Start running processes, including screen
 function start_ceilometer() {
-    screen_it ceilometer-acompute "cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_AGENT_CONF"
+    screen_it ceilometer-acompute "cd $CEILOMETER_DIR && sg libvirtd \"$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_AGENT_CONF\""
     screen_it ceilometer-acentral "export OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD OS_TENANT_NAME=$OS_TENANT_NAME OS_AUTH_URL=$OS_AUTH_URL && cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-agent-central --config-file $CEILOMETER_AGENT_CONF"
     screen_it ceilometer-collector "cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_COLLECTOR_CONF"
     screen_it ceilometer-api "cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR"