ebfac64d2a
Add support for generically setting arguments for OpenStack Networking for both the server and agent. This is done using Q_SRV_EXTRA_OPTS for the server, which let you place settings in the "OVS" or "LINUX_BRIDGE" sections of the plugin configuration file. For the agent, two variables are defined: Q_AGENT_EXTRA_AGENT_OPTS lets you set items in the "AGENT" section of the plugin configuration file, and Q_AGENT_EXTRA_SRV_OPTS lets you set things in the "OVS" or "LINUX_BRIDGE" sections of the plugin configuration file. Implements blueprint devstack-quantum-config. Change-Id: I9ba44b21231f88cda1bcc5e3389c7875f03d8145
77 lines
2.9 KiB
Plaintext
77 lines
2.9 KiB
Plaintext
# Quantum Linux Bridge L2 agent
|
|
# -----------------------------
|
|
|
|
# Save trace setting
|
|
PLUGIN_XTRACE=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
function is_quantum_ovs_base_plugin() {
|
|
# linuxbridge doesn't use OVS
|
|
return 1
|
|
}
|
|
|
|
function quantum_plugin_create_nova_conf() {
|
|
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
|
}
|
|
|
|
function quantum_plugin_install_agent_packages() {
|
|
install_package bridge-utils
|
|
}
|
|
|
|
function quantum_plugin_configure_debug_command() {
|
|
iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT external_network_bridge
|
|
}
|
|
|
|
function quantum_plugin_configure_dhcp_agent() {
|
|
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager quantum.agent.dhcp_agent.DhcpAgentWithStateReport
|
|
}
|
|
|
|
function quantum_plugin_configure_l3_agent() {
|
|
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge
|
|
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager quantum.agent.l3_agent.L3NATAgentWithStateReport
|
|
}
|
|
|
|
function quantum_plugin_configure_plugin_agent() {
|
|
# Setup physical network interface mappings. Override
|
|
# ``LB_VLAN_RANGES`` and ``LB_INTERFACE_MAPPINGS`` in ``localrc`` for more
|
|
# complex physical network configurations.
|
|
if [[ "$LB_INTERFACE_MAPPINGS" = "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$LB_PHYSICAL_INTERFACE" != "" ]]; then
|
|
LB_INTERFACE_MAPPINGS=$PHYSICAL_NETWORK:$LB_PHYSICAL_INTERFACE
|
|
fi
|
|
if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE physical_interface_mappings $LB_INTERFACE_MAPPINGS
|
|
fi
|
|
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
|
|
else
|
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
|
|
fi
|
|
AGENT_BINARY="$QUANTUM_DIR/bin/quantum-linuxbridge-agent"
|
|
# Define extra "AGENT" configuration options when q-agt is configured by defining
|
|
# the array ``Q_AGENT_EXTRA_AGENT_OPTS``.
|
|
# For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)``
|
|
for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do
|
|
# Replace the first '=' with ' ' for iniset syntax
|
|
iniset /$Q_PLUGIN_CONF_FILE AGENT ${I/=/ }
|
|
done
|
|
# Define extra "LINUX_BRIDGE" configuration options when q-agt is configured by defining
|
|
# the array ``Q_AGENT_EXTRA_SRV_OPTS``.
|
|
# For Example: ``Q_AGENT_EXTRA_SRV_OPTS=(foo=true bar=2)``
|
|
for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do
|
|
# Replace the first '=' with ' ' for iniset syntax
|
|
iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE ${I/=/ }
|
|
done
|
|
}
|
|
|
|
function quantum_plugin_setup_interface_driver() {
|
|
local conf_file=$1
|
|
iniset $conf_file DEFAULT interface_driver quantum.agent.linux.interface.BridgeInterfaceDriver
|
|
}
|
|
|
|
function quantum_plugin_check_adv_test_requirements() {
|
|
is_service_enabled q-agt && is_service_enabled q-dhcp && return 0
|
|
}
|
|
|
|
# Restore xtrace
|
|
$PLUGIN_XTRACE
|