Merge "Devstack changes to ceilometer to support vsphere"
diff --git a/lib/ceilometer b/lib/ceilometer
index 6aaddce..692ce1d 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -163,6 +163,13 @@
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 {
@@ -219,6 +226,9 @@
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"