d3c0f202f2
The two commits are squashed since they are both gate fixes (And can't be merged otherwise) Gate fix: Define AGENT_BINARY to true Following [1] , devstack defines all processes, even disabled ones. This failes on q-agt in Dragonflow, since it is not defined (In Dragonflow, it doesn't exist). Setting AGENT_BINARY to true works around this issue, since true won't fail, but won't actually do anything. [1] https://review.openstack.org/#/c/469390 Change-Id: Iea4c38c3708c058667040cca3904d708d785f48e Disable horizon in gate We don't actually test horizon. Following [1], it should be removed. [1] https://review.openstack.org/#/c/474283/ Change-Id: If7d1148380848c5ec9270dcccc3782edb1027812
49 lines
1.6 KiB
Plaintext
49 lines
1.6 KiB
Plaintext
# NOTE(xiaohhui): By default, devstack will set Q_AGENT as openvswitch.
|
|
# Here we deny that, because there is no agent in DF. But most of
|
|
# functions in lib/neutron_plugins/openvswitch_agent are needed. So,
|
|
# lib/neutron_plugins/openvswitch_agent is still used here. And override
|
|
# functions can be added in this file.
|
|
Q_AGENT=${Q_AGENT:-" "}
|
|
|
|
source $TOP_DIR/lib/neutron_plugins/openvswitch_agent
|
|
|
|
# This function is invoked by DevStack's Neutron plugin setup
|
|
# code and is being overridden here since the DF devstack
|
|
# plugin will handle the install.
|
|
function neutron_plugin_install_agent_packages {
|
|
:
|
|
}
|
|
|
|
# Workaround for devstack/systemd, which will try to define q-agt even though
|
|
# it's disabled.
|
|
AGENT_BINARY=$(which true)
|
|
|
|
if is_service_enabled df-l3-agent ; then
|
|
AGENT_L3_BINARY=${AGENT_L3_BINARY:-"$(get_python_exec_prefix)/df-l3-agent"}
|
|
enable_service q-l3
|
|
fi
|
|
|
|
if is_service_enabled df-metadata ; then
|
|
disable_service q-meta
|
|
fi
|
|
|
|
DRAGONFLOW_CONF=/etc/neutron/dragonflow.ini
|
|
Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron
|
|
Q_PLUGIN_EXTRA_CONF_FILES=(dragonflow.ini)
|
|
|
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-"df"}
|
|
ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-"df-l3"}
|
|
|
|
# OVS bridge definition
|
|
Q_USE_PROVIDERNET_FOR_PUBLIC=${Q_USE_PROVIDERNET_FOR_PUBLIC:-False}
|
|
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
|
|
INTEGRATION_BRIDGE=${INTEGRATION_BRIDGE:-br-int}
|
|
INTEGRATION_PEER_PORT=${INTEGRATION_PEER_PORT:-patch-ex}
|
|
PUBLIC_PEER_PORT=${PUBLIC_PEER_PORT:-patch-int}
|
|
|
|
if [[ "$ENABLE_DPDK" == "True" ]]; then
|
|
# By default, dragonflow uses OVS kernel datapath. If you want to use
|
|
# user space datapath powered by DPDK, please use 'netdev'.
|
|
OVS_DATAPATH_TYPE=netdev
|
|
fi
|