Browse code

Merge "VMware: update cinder support for VMware configuration settings"

Jenkins authored on 2013/08/28 01:07:45
Showing 1 changed files
... ...
@@ -289,12 +289,11 @@ function configure_cinder() {
289 289
         fi
290 290
     elif [ "$CINDER_DRIVER" == "vsphere" ]; then
291 291
         echo_summary "Using VMware vCenter driver"
292
-        iniset $CINDER_CONF DEFAULT enabled_backends vmware
293
-        iniset $CINDER_CONF vmware host_ip "$VMWAREAPI_IP"
294
-        iniset $CINDER_CONF vmware host_username "$VMWAREAPI_USER"
295
-        iniset $CINDER_CONF vmware host_password "$VMWAREAPI_PASSWORD"
296
-        iniset $CINDER_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
297
-        iniset $CINDER_CONF vmware volume_driver "cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver"
292
+        iniset $CINDER_CONF DEFAULT vmware_host_ip "$VMWAREAPI_IP"
293
+        iniset $CINDER_CONF DEFAULT vmware_host_username "$VMWAREAPI_USER"
294
+        iniset $CINDER_CONF DEFAULT vmware_host_password "$VMWAREAPI_PASSWORD"
295
+        iniset $CINDER_CONF DEFAULT vmware_cluster_name "$VMWAREAPI_CLUSTER"
296
+        iniset $CINDER_CONF DEFAULT volume_driver "cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver"
298 297
     fi
299 298
 
300 299
     if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then