summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-10-27 15:07:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-27 15:07:38 +0000
commitf46bf98e198d5b36aec8f2dada0adad12550e75a (patch)
tree1f3c974aa323da54b6a369102dd1554d3699cdaf /deploy
parentc5b7a198f1d69fd591696cc8e0c6ef81c6557ea4 (diff)
parentf60fae5990e93052e150d09c3d39272f79925d0c (diff)
Merge "Use odl v1 mechanism driver of L2 scenario" into stable/coloradocolorado.2.rc1
Diffstat (limited to 'deploy')
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml6
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml6
2 files changed, 12 insertions, 0 deletions
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