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
61 lines
2.0 KiB
Bash
61 lines
2.0 KiB
Bash
#!/bin/bash
|
|
#
|
|
# Common code used by cisco and embrane plugins
|
|
# ---------------------------------------------
|
|
|
|
# This module used to be for Open vSwitch monolithic plugin,
|
|
# which has been removed in Juno.
|
|
|
|
# Save trace setting
|
|
_XTRACE_NEUTRON_OVS=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
source $TOP_DIR/lib/neutron_plugins/openvswitch_agent
|
|
|
|
function neutron_plugin_configure_common {
|
|
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/openvswitch
|
|
Q_PLUGIN_CONF_FILENAME=ovs_neutron_plugin.ini
|
|
Q_PLUGIN_CLASS="neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
|
|
}
|
|
|
|
function neutron_plugin_configure_service {
|
|
if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs tenant_network_type gre
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_id_ranges $TENANT_TUNNEL_RANGES
|
|
elif [[ "$ENABLE_TENANT_VLANS" == "True" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs tenant_network_type vlan
|
|
else
|
|
echo "WARNING - The openvswitch plugin is using local tenant networks, with no connectivity between hosts."
|
|
fi
|
|
|
|
# Override ``OVS_VLAN_RANGES`` and ``OVS_BRIDGE_MAPPINGS`` in ``localrc``
|
|
# for more complex physical network configurations.
|
|
if [[ "$OVS_VLAN_RANGES" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]]; then
|
|
OVS_VLAN_RANGES=$PHYSICAL_NETWORK
|
|
if [[ "$TENANT_VLAN_RANGE" != "" ]]; then
|
|
OVS_VLAN_RANGES=$OVS_VLAN_RANGES:$TENANT_VLAN_RANGE
|
|
fi
|
|
fi
|
|
if [[ "$OVS_VLAN_RANGES" != "" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs network_vlan_ranges $OVS_VLAN_RANGES
|
|
fi
|
|
|
|
_neutron_ovs_base_configure_firewall_driver
|
|
|
|
# Define extra "OVS" configuration options when q-svc is configured by defining
|
|
# the array ``Q_SRV_EXTRA_OPTS``.
|
|
# For Example: ``Q_SRV_EXTRA_OPTS=(foo=true bar=2)``
|
|
for I in "${Q_SRV_EXTRA_OPTS[@]}"; do
|
|
# Replace the first '=' with ' ' for iniset syntax
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs ${I/=/ }
|
|
done
|
|
}
|
|
|
|
function has_neutron_plugin_security_group {
|
|
return 0
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NEUTRON_OVS
|
|
|