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
52 lines
1.5 KiB
Bash
52 lines
1.5 KiB
Bash
#!/bin/bash
|
|
|
|
# Neutron loadbalancer plugin
|
|
# ---------------------------
|
|
|
|
# Save trace setting
|
|
_XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
|
|
AGENT_LBAAS_BINARY="$NEUTRON_BIN_DIR/neutron-lbaas-agent"
|
|
LBAAS_PLUGIN=neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin
|
|
|
|
function neutron_agent_lbaas_install_agent_packages {
|
|
if is_ubuntu || is_fedora || is_suse; then
|
|
install_package haproxy
|
|
fi
|
|
}
|
|
|
|
function neutron_agent_lbaas_configure_common {
|
|
_neutron_service_plugin_class_add $LBAAS_PLUGIN
|
|
_neutron_deploy_rootwrap_filters $NEUTRON_LBAAS_DIR
|
|
}
|
|
|
|
function neutron_agent_lbaas_configure_agent {
|
|
LBAAS_AGENT_CONF_PATH=/etc/neutron/services/loadbalancer/haproxy
|
|
mkdir -p $LBAAS_AGENT_CONF_PATH
|
|
|
|
LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"
|
|
|
|
cp $NEUTRON_LBAAS_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
|
|
|
|
# ovs_use_veth needs to be set before the plugin configuration
|
|
# occurs to allow plugins to override the setting.
|
|
iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH
|
|
|
|
neutron_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME
|
|
|
|
if is_fedora; then
|
|
iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"
|
|
iniset $LBAAS_AGENT_CONF_FILENAME haproxy user_group "nobody"
|
|
fi
|
|
}
|
|
|
|
function neutron_lbaas_stop {
|
|
pids=$(ps aux | awk '/haproxy/ { print $2 }')
|
|
[ ! -z "$pids" ] && sudo kill $pids || true
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NEUTRON_LB
|