Plugin version is required

Plugin version is required when plugin configuration is overwritten.

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

5 files changed, 19 insertions, 9 deletions

diff --git a/deploy/config/plugins/fuel-nshovs_0.9.0.yaml b/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
index c66927bac..b5caae039 100644
--- a/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
+++ b/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
@@ -32,4 +32,6 @@ fuel-plugin-ovs:
         weight: 20
         value: false
         label: "Install NSH"
+      metadata:
+        plugin_version: 0.9.0
     weight: 70
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 2e2332f19..1fb451721 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -32,24 +32,28 @@ deployment-scenario-metadata:
 # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
 # It does so by copying the config file to the local plugin config directory
 stack-extensions:
-  - module: nsh-ovs
+  - module: fuel-plugin-ovs
     module-config-name: fuel-nshovs
     module-config-version: 0.9.0
     module-config-override:
       metadata:
         versions:
-          install_nsh:
-            value: true
+          - install_nsh:
+              value: true
+            metadata:
+              plugin_version: 0.9.0
   - module: opendaylight
     module-config-name: fuel-odl
     module-config-version: 0.9.0
     module-config-override:
       metadata:
         versions:
-            enable_sfc:
+          - enable_sfc:
               value: true
             package_name:
               value: opendaylight-boron
+            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/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index 85bef533b..e222582d2 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -40,8 +40,10 @@ stack-extensions:
     module-config-override:
       metadata:
         versions:
-          enable_l3_odl:
-            value: true
+          - enable_l3_odl:
+              value: true
+            metadata:
+              plugin_version: 0.9.0
 #   - module: opendaylight
 #     module-config-name: fuel-odl
 #     module-config-version: 0.0.2
diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 4303a7dd2..bf72ad7e5 100644
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -32,7 +32,7 @@ deployment-scenario-metadata:
 # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
 # It does so by copying the config file to the local plugin config directory
 stack-extensions:
-  - module: nsh-ovs
+  - module: fuel-plugin-ovs
     module-config-name: fuel-nshovs
     module-config-version: 0.9.0
     module-config-override:
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 176d985bd..bb0e28db2 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -40,8 +40,10 @@ stack-extensions:
     module-config-override:
       metadata:
         versions:
-          enable_l3_odl:
-            value: true
+          - enable_l3_odl:
+              value: true
+            metadata:
+              plugin_version: 0.9.0
 #   - module: opendaylight
 #     module-config-name: fuel-odl
 #     module-config-version: 0.0.2