openstack/deb-networking-odl
Code Issues Proposed changes

Fix config for grenade

Browse Source 
It was using master branch of networking-odl for
before and aftre update, it should use latest stable
release for before update and master after update.
This also enable the use of new netvirt with grenade
job.

Change-Id: Ie9c609179de1d5bd8a44f8b6fbf0465b5f822917
This commit is contained in:
Manjeet Singh Bhatia
2017-06-07 18:46:25 +00:00
committed by Isaku Yamahata
parent 9e208e9094
commit 07a5d62e43
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/upgrade/settings
View File

@@ -4,9 +4,16 @@ register_project_for_upgrade networking-odl
# networking-odl before neutron
UPGRADE_PROJECTS="networking-odl ${UPGRADE_PROJECTS/ networking-odl/}"
# Add karaf features to be enabled for ODL
ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-mdsal-apidocs
ODL_NETVIRT_KARAF_FEATURE+=,odl-l2switch-switch,odl-netvirt-openstack
# for base it should be enabling recent stable/release
devstack_localrc base enable_plugin networking-odl http://github.com/openstack/networking-odl.git stable/ocata
devstack_localrc target enable_plugin networking-odl http://github.com/openstack/networking-odl.git
for w in base target; do
devstack_localrc $w enable_plugin networking-odl http://github.com/openstack/networking-odl.git
devstack_localrc $w disable_service q-agt
devstack_localrc $w disable_service q-l3
devstack_localrc $w enable_service q-dhcp
@@ -19,5 +26,7 @@ for w in base target; do
devstack_localrc $w Q_USE_PUBLIC_VETH=True
devstack_localrc $w Q_PUBLIC_VETH_EX=veth-pub-ex
devstack_localrc $w Q_PUBLIC_VETH_INT=veth-pub-int
devstack_localrc $w ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:\${Q_PUBLIC_VETH_INT}}
devstack_localrc $w ODL_RELEASE=carbon-snapshot-0.6
devstack_localrc $w ODL_PROVIDER_MAPPINGS=public:${Q_PUBLIC_VETH_INT}
devstack_localrc $w ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE}
done