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
44 lines
1.5 KiB
Bash
44 lines
1.5 KiB
Bash
#!/bin/bash
|
|
#
|
|
# Neutron Embrane plugin
|
|
# ---------------------------
|
|
|
|
# Save trace setting
|
|
_XTRACE_NEUTRON_EMBR=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
source $TOP_DIR/lib/neutron_plugins/openvswitch
|
|
|
|
function save_function {
|
|
local ORIG_FUNC
|
|
ORIG_FUNC=$(declare -f $1)
|
|
local NEW_FUNC="$2${ORIG_FUNC#$1}"
|
|
eval "$NEW_FUNC"
|
|
}
|
|
|
|
save_function neutron_plugin_configure_service _neutron_plugin_configure_service
|
|
|
|
function neutron_plugin_configure_common {
|
|
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/embrane
|
|
Q_PLUGIN_CONF_FILENAME=heleos_conf.ini
|
|
Q_PLUGIN_CLASS="neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin"
|
|
}
|
|
|
|
function neutron_plugin_configure_service {
|
|
_neutron_plugin_configure_service
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos esm_mgmt $HELEOS_ESM_MGMT
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos admin_username $HELEOS_ADMIN_USERNAME
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos admin_password $HELEOS_ADMIN_PASSWORD
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos router_image $HELEOS_ROUTER_IMAGE
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos mgmt_id $HELEOS_MGMT_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos inband_id $HELEOS_INBAND_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos oob_id $HELEOS_OOB_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos dummy_utif_id $HELEOS_DUMMY_UTIF_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos resource_pool_id $HELEOS_RESOURCE_POOL_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos async_requests $HELEOS_ASYNC_REQUESTS
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NEUTRON_EMBR
|
|
|