Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion devstack/lib/neutron_plugins/opencontrail
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ function neutron_plugin_check_adv_test_requirements() {
}

function neutron_plugin_create_nova_conf {
iniset $NOVA_CONF DEFAULT network_api_class nova_contrail_vif.contrailvif.ContrailNetworkAPI
if ! python -c "import nova.network.model as nova_network; exit(0) if hasattr(nova_network, 'VIF_TYPE_VROUTER') else exit(1)"; then
iniset $NOVA_CONF DEFAULT network_api_class nova_contrail_vif.contrailvif.ContrailNetworkAPI
fi
}

# Restore xtrace
Expand Down