From f60fae5990e93052e150d09c3d39272f79925d0c Mon Sep 17 00:00:00 2001
From: Michal Skalski <mskalski@mirantis.com>
Date: Thu, 27 Oct 2016 10:29:20 +0200
Subject: Use odl v1 mechanism driver of L2 scenario

ODL Boron + v2 version of networking-odl does not currently support
assigning security groups to existing VM in L2 scenario. For details
please look at:

* https://bugs.opendaylight.org/show_bug.cgi?id=7021
* https://gerrit.opnfv.org/gerrit/#/c/23637/

JIRA: FUEL-216

Change-Id: Ic16bccf248ee4fbf0d97bfcd19f2831f36136521
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
---
 deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml    | 6 ++++++
 deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'deploy')

diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 90c89aedc..f159293e9 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -36,6 +36,12 @@ stack-extensions:
     module-config-name: fuel-odl
     module-config-version: 0.9.0
     module-config-override:
+      metadata:
+        versions:
+          - odl_v2:
+              value: false
+            metadata:
+              plugin_version: 0.9.0
 # Note that the module substitionion does not support arrays
 # This is a quick fix
 #   - module: opendaylight
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index f8787d780..b1ef94712 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -36,6 +36,12 @@ stack-extensions:
     module-config-name: fuel-odl
     module-config-version: 0.9.0
     module-config-override:
+      metadata:
+        versions:
+          - odl_v2:
+              value: false
+            metadata:
+              plugin_version: 0.9.0
 # Note that the module substitionion does not support arrays
 # This is a quick fix
 #   - module: opendaylight
-- 
cgit