openstack
/
deb-networking-odl
Code Issues Proposed changes

Merge "Revert "Update Full stack config""

This commit is contained in:
Jenkins 2017-07-12 14:02:56 +00:00 committed by Gerrit Code Review
parent 82fad3ac21 1b750a45b2
commit 36de2a102b
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -81,7 +81,6 @@ 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
devstack/pre_test_hook.sh
View File

@ -6,7 +6,6 @@ set -xe
GATE_DEST=$BASE/new
DEVSTACK_PATH=$GATE_DEST/devstack
# for localrc_set
ODL_NETVIRT_COMMON=odl-neutron-service,odl-restconf-all,odl-aaa-authn
source $DEVSTACK_PATH/inc/ini-config
case "$ODL_RELEASE_BASE" in
@ -100,9 +99,7 @@ case "$ODL_RELEASE_BASE" in
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger
;;
carbon-snapshot|nitrogen-snapshot)
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_COMMON,odl-netvirt-openstack,odl-neutron-logger,odl-neutron-hostconfig-ovs
ODL_GATE_SERVICE_PROVIDER="netvirt"
ODL_MAPPING_KEY="public"
ODL_NETVIRT_KARAF_FEATURE=$ODL_NETVIRT_KARAF_FEATURE,odl-neutron-logger,odl-neutron-hostconfig-ovs
;;
*)
;;

3
tools/configure_for_func_testing.sh
View File

@ -190,8 +190,7 @@ function _install_opendaylight {
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-netvirt-openstack,odl-neutron-logger
ODL_PROVIDER_MAPPINGS=public:${Q_PUBLIC_VETH_INT}
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
fi
ODL_BOOT_WAIT_URL=controller/nb/v2/neutron/networks
source $NETWORKING_ODL_DIR/devstack/settings.odl