From 846609b627bff979ce767dd9ad00daa46a150342 Mon Sep 17 00:00:00 2001
From: Piyush Masrani <pmasrani@vmware.com>
Date: Fri, 14 Mar 2014 19:21:48 +0530
Subject: [PATCH] Devstack changes to ceilometer to support vsphere

Ceilometer currently supports only libvirt when installed
using devstack. Have extended this support to Vmware Vsphere in this changelist.

Change-Id: I98c64204973bca5e6a7f859a5431adb2b661277f
---
 lib/ceilometer | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/ceilometer b/lib/ceilometer
index b0899e2f24..abf4629b5e 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -161,6 +161,13 @@ function configure_ceilometer {
         configure_mongodb
         cleanup_ceilometer
     fi
+
+    if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
+        iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere
+        iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP"
+        iniset $CEILOMETER_CONF vmware host_username "$VMWAREAPI_USER"
+        iniset $CEILOMETER_CONF vmware host_password "$VMWAREAPI_PASSWORD"
+    fi
 }
 
 function configure_mongodb {
@@ -204,6 +211,9 @@ function start_ceilometer {
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
         screen_it ceilometer-acompute "cd ; sg $LIBVIRT_GROUP \"ceilometer-agent-compute --config-file $CEILOMETER_CONF\""
     fi
+    if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
+        screen_it ceilometer-acompute "cd ; ceilometer-agent-compute --config-file $CEILOMETER_CONF"
+    fi
     screen_it ceilometer-acentral "cd ; ceilometer-agent-central --config-file $CEILOMETER_CONF"
     screen_it ceilometer-anotification "cd ; ceilometer-agent-notification --config-file $CEILOMETER_CONF"
     screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"