Browse code

Merge "Devstack changes to ceilometer to support vsphere"

Jenkins authored on 2014/03/18 07:01:22
Showing 1 changed files
... ...
@@ -163,6 +163,13 @@ function configure_ceilometer {
163 163
         configure_mongodb
164 164
         cleanup_ceilometer
165 165
     fi
166
+
167
+    if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
168
+        iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere
169
+        iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP"
170
+        iniset $CEILOMETER_CONF vmware host_username "$VMWAREAPI_USER"
171
+        iniset $CEILOMETER_CONF vmware host_password "$VMWAREAPI_PASSWORD"
172
+    fi
166 173
 }
167 174
 
168 175
 function configure_mongodb {
... ...
@@ -219,6 +226,9 @@ function start_ceilometer {
219 219
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
220 220
         screen_it ceilometer-acompute "cd ; sg $LIBVIRT_GROUP \"ceilometer-agent-compute --config-file $CEILOMETER_CONF\""
221 221
     fi
222
+    if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
223
+        screen_it ceilometer-acompute "cd ; ceilometer-agent-compute --config-file $CEILOMETER_CONF"
224
+    fi
222 225
     screen_it ceilometer-acentral "cd ; ceilometer-agent-central --config-file $CEILOMETER_CONF"
223 226
     screen_it ceilometer-anotification "cd ; ceilometer-agent-notification --config-file $CEILOMETER_CONF"
224 227
     screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"