Uplift OpenDaylight plugin to Fuel 10

Currently only update pure odl scenarios because both sfc and bgpvpn
variants require additional plugins.

JIRA: FUEL-224
JIRA: FUEL-222

Change-Id: I9891029d3f6a4b6b124cca13caceaab6edb6ca6a
Signed-off-by: Michal Skalski <mskalski@mirantis.com>

4 files changed, 18 insertions, 54 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..356abb07e 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: ODL-L2 HA deployment
-   version: 0.0.4
-   created: Jun 02 2016
-   comment: Rebased to Fuel9
+   version: 0.0.5
+   created: Dec 07 2016
+   comment: Rebased to Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.9.0
+    module-config-version: 1.0.0
     module-config-override:
 # Note that the module substitionion does not support arrays
 # This is a quick fix
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index 967e7d295..43eb9029b 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: ODL-L3 HA deployment
-   version: 0.0.5
-   created: Jun 02 2016
-   comment: Rebased to Fuel9
+   version: 0.0.6
+   created: Dec 07 2016
+   comment: Rebased to Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -36,32 +36,14 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.9.0
+    module-config-version: 1.0.0
     module-config-override:
       metadata:
         versions:
           - enable_l3_odl:
               value: true
             metadata:
-              plugin_version: 0.9.0
-
-  - module: fuel-plugin-ovs
-    module-config-name: fuel-nshovs
-    module-config-version: 0.9.0
-
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-#       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: true
-#       enable_sfc:
-#         value: false
+              plugin_version: 1.0.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary
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..903aa57fb 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: ODL-L2 No-HA deployment
-   version: 0.0.3
-   created: Jun 02 2016
-   comment: Rebased to Fuel9
+   version: 0.0.4
+   created: Dec 07 2016
+   comment: Rebased to Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.9.0
+    module-config-version: 1.0.0
     module-config-override:
 # Note that the module substitionion does not support arrays
 # This is a quick fix
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index 0c8415f78..3353d6744 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: ODL-L3 No-HA deployment
-   version: 0.0.4
-   created: Jun 02 2016
-   comment: Rebased to Fuel9
+   version: 0.0.5
+   created: Dec 07 2016
+   comment: Rebased to Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -36,32 +36,14 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.9.0
+    module-config-version: 1.0.0
     module-config-override:
       metadata:
         versions:
           - enable_l3_odl:
               value: true
             metadata:
-              plugin_version: 0.9.0
-
-  - module: fuel-plugin-ovs
-    module-config-name: fuel-nshovs
-    module-config-version: 0.9.0
-
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: true
-#       enable_sfc:
-#         value: false
+              plugin_version: 1.0.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary