From 07a5d62e43f3ea7ece8e56002f9370f59fb69072 Mon Sep 17 00:00:00 2001
From: Manjeet Singh Bhatia <manjeet.s.bhatia@intel.com>
Date: Wed, 7 Jun 2017 18:46:25 +0000
Subject: [PATCH] Fix config for grenade

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
---
 devstack/upgrade/settings | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 9c8e069a7..b0090e0ff 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -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