3f34d9af71
Several changes didn't properly deal with openSUSE, so fix this. Change-Id: Icc9c894031a8a693d9c41e2ec5717bd76f618342
53 lines
1.6 KiB
Plaintext
53 lines
1.6 KiB
Plaintext
# common functions for ovs based plugin
|
|
# -------------------------------------
|
|
|
|
# Save trace setting
|
|
MY_XTRACE=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
function is_quantum_ovs_base_plugin() {
|
|
# Yes, we use OVS.
|
|
return 0
|
|
}
|
|
|
|
function _quantum_ovs_base_setup_bridge() {
|
|
local bridge=$1
|
|
quantum-ovs-cleanup
|
|
sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge
|
|
sudo ovs-vsctl --no-wait br-set-external-id $bridge bridge-id $bridge
|
|
}
|
|
|
|
function _quantum_ovs_base_install_agent_packages() {
|
|
local kernel_version
|
|
# Install deps
|
|
# FIXME add to ``files/apts/quantum``, but don't install if not needed!
|
|
if is_ubuntu; then
|
|
kernel_version=`cat /proc/version | cut -d " " -f3`
|
|
install_package make fakeroot dkms openvswitch-switch openvswitch-datapath-dkms linux-headers-$kernel_version
|
|
elif is_fedora; then
|
|
install_package openvswitch
|
|
# Ensure that the service is started
|
|
restart_service openvswitch
|
|
elif is_suse; then
|
|
### FIXME: Find out if package can be pushed to Factory
|
|
echo "OpenVSwitch packages can be installed from Cloud:OpenStack:Master in OBS"
|
|
restart_service openvswitch
|
|
fi
|
|
}
|
|
|
|
function _quantum_ovs_base_configure_debug_command() {
|
|
iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
|
|
}
|
|
|
|
function _quantum_ovs_base_configure_l3_agent() {
|
|
iniset $Q_L3_CONF_FILE DEFAULT external_network_bridge $PUBLIC_BRIDGE
|
|
|
|
quantum-ovs-cleanup
|
|
sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
|
|
# ensure no IP is configured on the public bridge
|
|
sudo ip addr flush dev $PUBLIC_BRIDGE
|
|
}
|
|
|
|
# Restore xtrace
|
|
$MY_XTRACE
|