Turn kvm-plugin back on

Change-Id: I7c46f263ec584b09b6022d9e961ae3c44c642954
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 844da40..e189e16 100644 (file)
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
 # Add Fuel plugin build targets here
 # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild
+PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild
 export PLUGINS
 NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
 

diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index eaef3d4..fa284b3 100644 (file)
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KVMFORNFV_BRANCH=stable/colorado
+KVMFORNFV_BRANCH=master
 KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b
+KVMFORNFV_CHANGE=ec568fdb37d280371733cab5e9fad030557f6921

diff --git a/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml b/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
new file mode 100644 (file)
index 0000000..7d4dd09
--- /dev/null
+++ b/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
@@ -0,0 +1,34 @@
+##############################################################################
+# Copyright (c) 2016 Mirantis, Inc. and others.
+# mpolenchuk@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+plugin-config-metadata:
+  title: NFV KVM fuel Plugin configuration template
+  version: 1.0.0
+  created: 05.12.2016
+  comment: None
+
+fuel-plugin-kvm:
+  metadata:
+    #chosen_id: Assigned during installation
+    class: plugin
+    default: false
+    enabled: true
+    label: fuel-plugin-kvm
+    toggleable: true
+    versions:
+    - metadata:
+        always_editable: false
+        #plugin_id: 1 Assigned during installation
+        plugin_version: 1.0.0
+      use_kvm:
+        label: 'EXPERIMENTAL: KVM enhancements for NFV'
+        type: checkbox
+        value: true
+        weight: 20
+    weight: 70

diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 1217f72..8ced66d 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
 stack-extensions:
    - module: fuel-plugin-kvm
      module-config-name: fuel-nfvkvm
-     module-config-version: 0.9.0
+     module-config-version: 1.0.0
      module-config-override:
        # Module config overrides