configure ODL L3 on computes based on CONTROLLERFEATURES

Change-Id: Icdac983dce83065fa1ede8beadf580364fa604c3
Signed-off-by: Alon Kochba <alonko@hpe.com>

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 3361d86d970e4a27bcb7804a762f483a785fb615..ad0b1eca55b3e6835a4ab4122750b2561985c27f 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -93,7 +93,7 @@ fi
 # if we are using the old netvirt impl, as determined by the feature name
 # odl-ovsdb-openstack (note: new impl is odl-netvirt-openstack) then we
 # want ODL_L3 to be True.  New impl wants it False
-if [[ ${CONTROLLERFEATURES}} == *"odl-ovsdb-openstack"* ]]; then
+if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
   ODL_L3=True
 else
   ODL_L3=False
@@ -203,7 +203,7 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
 cat >> ${local_conf_file_name} << EOF
 # Uncomment lines below if odl-compute is to be used for l3 forwarding
 Q_L3_ENABLED=True
-ODL_L3=True
+ODL_L3=${ODL_L3}
 PUBLIC_INTERFACE=br100
 EOF
 fi