e7df43395c
This patch intends to make the transition of the OVN DevStack module easier by allowing both copies of it to exist at the same time, the one in Neutron repository and the one in the DevStack repository [0]. 1) Make create_public_bridge idempotent If we call this function more than once the second call and on will fail with the following error: 2020-07-13 09:12:53.885633 | controller | ++ /opt/stack/neutron/devstack/lib/ovn_agent:create_public_bridge:263 : sudo ip addr add 172.24.5.1/24 dev br-ex 2020-07-13 09:12:53.894247 | controller | RTNETLINK answers: File exists During the transiton of moving the OVN DevStack from the Neutron repository to the DevStack repository [0] this method is being invoked twice in the ovn job in the DevStack gate because it will be cause as part of the plugin being enabled and the normal code execution. This patch makes the method idempotent by calling "addr replace" instead of "addr add" to avoid the "RTNETLINK answers: File exists" error. 2) Move the setup of the tcpdump on br-ex to "extra" to it can start after the create_public_bridge is called. [0] https://review.opendev.org/#/c/734621/ Change-Id: I74b05ef245a343c7531fa45aeadb90060b2fd22e Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
160 lines
5.8 KiB
Bash
160 lines
5.8 KiB
Bash
LIBDIR=$DEST/neutron/devstack/lib
|
|
|
|
source $LIBDIR/dns
|
|
source $LIBDIR/flavors
|
|
source $LIBDIR/l2_agent
|
|
source $LIBDIR/l2_agent_sriovnicswitch
|
|
source $LIBDIR/l3_agent
|
|
source $LIBDIR/l3_conntrack_helper
|
|
source $LIBDIR/ml2
|
|
source $LIBDIR/network_segment_range
|
|
source $LIBDIR/qos
|
|
source $LIBDIR/ovs
|
|
source $LIBDIR/segments
|
|
source $LIBDIR/trunk
|
|
source $LIBDIR/placement
|
|
source $LIBDIR/log
|
|
source $LIBDIR/fip_port_forwarding
|
|
source $LIBDIR/uplink_status_propagation
|
|
source $LIBDIR/tag_ports_during_bulk_creation
|
|
source $LIBDIR/octavia
|
|
|
|
Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
|
|
|
|
function is_ovn_enabled {
|
|
[[ $NEUTRON_AGENT == "ovn" ]] && return 0
|
|
return 1
|
|
}
|
|
|
|
if [ -f $LIBDIR/${NEUTRON_AGENT}_agent ]; then
|
|
source $LIBDIR/${NEUTRON_AGENT}_agent
|
|
fi
|
|
|
|
if [[ "$1" == "stack" ]]; then
|
|
case "$2" in
|
|
install)
|
|
if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
|
|
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
|
|
remove_ovs_packages
|
|
compile_ovs False /usr /var
|
|
load_conntrack_gre_module
|
|
start_new_ovs
|
|
fi
|
|
if is_ovn_enabled; then
|
|
install_ovn
|
|
configure_ovn
|
|
init_ovn
|
|
fi
|
|
;;
|
|
post-config)
|
|
if is_service_enabled neutron-tag-ports-during-bulk-creation; then
|
|
configure_tag_ports_during_bulk_creation_extension
|
|
fi
|
|
if is_service_enabled neutron-uplink-status-propagation; then
|
|
configure_uplink_status_propagation_extension
|
|
fi
|
|
if is_service_enabled q-flavors neutron-flavors; then
|
|
configure_flavors
|
|
fi
|
|
if is_service_enabled q-qos neutron-qos; then
|
|
configure_qos
|
|
fi
|
|
if is_service_enabled q-trunk neutron-trunk; then
|
|
configure_trunk_extension
|
|
fi
|
|
if is_service_enabled q-placement neutron-placement; then
|
|
configure_placement_extension
|
|
fi
|
|
if is_service_enabled q-log neutron-log; then
|
|
configure_log
|
|
fi
|
|
if is_service_enabled q-dns neutron-dns; then
|
|
configure_dns_extension
|
|
post_config_dns_extension
|
|
if is_service_enabled designate; then
|
|
configure_dns_integration
|
|
fi
|
|
fi
|
|
if is_service_enabled neutron-segments; then
|
|
configure_segments_extension
|
|
fi
|
|
if is_service_enabled neutron-network-segment-range; then
|
|
configure_network_segment_range
|
|
fi
|
|
if is_service_enabled q-agt neutron-agent; then
|
|
configure_l2_agent
|
|
fi
|
|
#Note: sriov agent should run with OVS or linux bridge agent
|
|
#because they are the mechanisms that bind the DHCP and router ports.
|
|
#Currently devstack lacks the option to run two agents on the same node.
|
|
#Therefore we create new service, q-sriov-agt, and the
|
|
# q-agt/neutron-agent should be OVS or linux bridge.
|
|
if is_service_enabled q-sriov-agt neutron-sriov-agent; then
|
|
configure_l2_agent
|
|
configure_l2_agent_sriovnicswitch
|
|
fi
|
|
if is_service_enabled q-l3 neutron-l3; then
|
|
if is_service_enabled q-qos neutron-qos; then
|
|
configure_l3_agent_extension_fip_qos
|
|
configure_l3_agent_extension_gateway_ip_qos
|
|
fi
|
|
if is_service_enabled q-port-forwarding neutron-port-forwarding; then
|
|
configure_port_forwarding
|
|
fi
|
|
if is_service_enabled q-conntrack-helper neutron-conntrack-helper; then
|
|
configure_l3_conntrack_helper
|
|
fi
|
|
configure_l3_agent
|
|
fi
|
|
if [ $NEUTRON_CORE_PLUGIN = ml2 ]; then
|
|
configure_ml2_extension_drivers
|
|
fi
|
|
if is_ovn_enabled; then
|
|
if is_service_enabled q-port-forwarding neutron-port-forwarding; then
|
|
configure_port_forwarding
|
|
fi
|
|
configure_ovn_plugin
|
|
start_ovn
|
|
fi
|
|
;;
|
|
extra)
|
|
if is_service_enabled q-sriov-agt neutron-sriov-agent; then
|
|
start_l2_agent_sriov
|
|
fi
|
|
|
|
if is_ovn_enabled; then
|
|
if [[ "$OVN_L3_CREATE_PUBLIC_NETWORK" == "True" ]]; then
|
|
if [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" != "True" ]]; then
|
|
echo "OVN_L3_CREATE_PUBLIC_NETWORK=True is being ignored because"
|
|
echo "NEUTRON_CREATE_INITIAL_NETWORKS is set to False"
|
|
else
|
|
create_public_bridge
|
|
fi
|
|
fi
|
|
fi
|
|
if is_service_enabled br-ex-tcpdump ; then
|
|
# tcpdump monitor on br-ex for ARP, reverse ARP and ICMP v4 / v6 packets
|
|
sudo ip link set dev $PUBLIC_BRIDGE up
|
|
run_process br-ex-tcpdump "/usr/sbin/tcpdump -i $PUBLIC_BRIDGE arp or rarp or icmp or icmp6 -enlX" "$STACK_GROUP" root
|
|
fi
|
|
|
|
if is_service_enabled br-int-flows ; then
|
|
run_process br-int-flows "/bin/sh -c \"set +e; while true; do echo ovs-ofctl dump-flows br-int; ovs-ofctl dump-flows br-int ; sleep 30; done; \"" "$STACK_GROUP" root
|
|
fi
|
|
;;
|
|
esac
|
|
elif [[ "$1" == "unstack" ]]; then
|
|
if is_service_enabled q-sriov-agt neutron-sriov-agent; then
|
|
stop_l2_agent_sriov
|
|
fi
|
|
if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
|
|
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
|
|
stop_new_ovs
|
|
fi
|
|
|
|
if is_ovn_enabled; then
|
|
stop_ovn
|
|
cleanup_ovn
|
|
fi
|
|
fi
|