From dc4f2342dba3bb37c42f1c0782eb2cb82d3a63a3 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@vmware.com>
Date: Mon, 19 Aug 2013 23:46:17 -0700
Subject: [PATCH] VMware: update cinder support for VMware configuration
settings
The review https://review.openstack.org/#/c/41600 was update to
have a 'vmware' prefix for all of the VMware cinder settings. These
were previously in a 'vmware' section and now they are in the
'DEFAULT' section.
Change-Id: I8eadfb0f64914d3b0667760aff651415df48f627
---
lib/cinder | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/cinder b/lib/cinder
index 54cf844831..ec5a3563b6 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -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