openstack/deb-networking-odl
Code Issues Proposed changes

Use new Netvirt for dsvm-fullstack

Browse Source 
Recently a change [1] was merged which forced new netvirt
to be used for all gate jobs, but intention was to use it
for fullstack carbon and nitrogen job. This is followup to
revert [2] of [1]

[1]. https://review.openstack.org/#/c/482281/
[2]. https://review.openstack.org/#/c/482814/

Change-Id: I495c2fa61d233cea74a5fd7c2f0145f7821700e5
This commit is contained in:
Manjeet Singh Bhatia
2017-07-12 16:25:08 +00:00
parent 36de2a102b
commit f59dba86d7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@@ -81,6 +81,7 @@ if is_service_enabled odl-compute; then
create_nova_conf_neutron
fi
bind_opendaylight_controller
sudo ovs-vsctl --may-exist add-br $OVS_BR
wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
# L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured

5
tools/configure_for_func_testing.sh
View File

@@ -188,9 +188,8 @@ function _install_opendaylight {
# openstack service provider isn't needed, only ODL neutron northbound
# is necessary for functional test
ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-neutron-logger
if [[ "$VENV" =~ "fullstack" ]]; then
# TODO: in future switch to new netvirt
ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack,odl-neutron-logger
if [[ "$VENV" =~ "dsvm-fullstack" ]]; then
export ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack,odl-neutron-logger
fi
ODL_BOOT_WAIT_URL=controller/nb/v2/neutron/networks
source $NETWORKING_ODL_DIR/devstack/settings.odl