523f488036
I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695
48 lines
1.2 KiB
Bash
48 lines
1.2 KiB
Bash
#!/bin/bash
|
|
#
|
|
# lib/cinder_backends/vmdk
|
|
# Configure the VMware vmdk backend
|
|
|
|
# Enable with:
|
|
#
|
|
# CINDER_ENABLED_BACKENDS+=,vmdk:<volume-type-name>
|
|
|
|
# Dependencies:
|
|
#
|
|
# - ``functions`` file
|
|
# - ``cinder`` configurations
|
|
|
|
# configure_cinder_backend_vmdk - Configure Cinder for VMware vmdk backends
|
|
|
|
# Save trace setting
|
|
_XTRACE_CINDER_VMDK=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
|
|
# Entry Points
|
|
# ------------
|
|
|
|
# configure_cinder_backend_vmdk - Set config files, create data dirs, etc
|
|
function configure_cinder_backend_vmdk {
|
|
# To use VMware vmdk backend, set the following in local.conf:
|
|
# CINDER_ENABLED_BACKENDS+=,vmdk:<volume-type-name>
|
|
# VMWAREAPI_IP=<vcenter-ip>
|
|
# VMWAREAPI_USER=<vcenter-admin-account>
|
|
# VMWAREAPI_PASSWORD=<vcenter-admin-password>
|
|
|
|
local be_name=$1
|
|
iniset $CINDER_CONF $be_name volume_backend_name $be_name
|
|
iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver"
|
|
iniset $CINDER_CONF $be_name vmware_host_ip "$VMWAREAPI_IP"
|
|
iniset $CINDER_CONF $be_name vmware_host_username "$VMWAREAPI_USER"
|
|
iniset $CINDER_CONF $be_name vmware_host_password "$VMWAREAPI_PASSWORD"
|
|
}
|
|
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_CINDER_VMDK
|
|
|
|
# Local variables:
|
|
# mode: shell-script
|
|
# End:
|