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

This commit is contained in:
Jenkins 2013-08-27 16:07:45 +00:00 committed by Gerrit Code Review
commit 0852604651

View File

@ -289,12 +289,11 @@ function configure_cinder() {
fi
elif [ "$CINDER_DRIVER" == "vsphere" ]; then
echo_summary "Using VMware vCenter driver"
iniset $CINDER_CONF DEFAULT enabled_backends vmware
iniset $CINDER_CONF vmware host_ip "$VMWAREAPI_IP"
iniset $CINDER_CONF vmware host_username "$VMWAREAPI_USER"
iniset $CINDER_CONF vmware host_password "$VMWAREAPI_PASSWORD"
iniset $CINDER_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
iniset $CINDER_CONF vmware volume_driver "cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver"
iniset $CINDER_CONF DEFAULT vmware_host_ip "$VMWAREAPI_IP"
iniset $CINDER_CONF DEFAULT vmware_host_username "$VMWAREAPI_USER"
iniset $CINDER_CONF DEFAULT vmware_host_password "$VMWAREAPI_PASSWORD"
iniset $CINDER_CONF DEFAULT vmware_cluster_name "$VMWAREAPI_CLUSTER"
iniset $CINDER_CONF DEFAULT volume_driver "cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver"
fi
if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then