From: Yunhong Jiang <yunhong.jiang@linux.intel.com>
Date: Wed, 21 Sep 2016 21:05:24 +0000 (-0700)
Subject: Revert "[Fuel-plugin] Install kernel in post-deployment."
X-Git-Tag: colorado.1.0^0
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=bda39fb65e89813f4f9a69bfa3aecd5c03e60360

Revert "[Fuel-plugin] Install kernel in post-deployment."

This reverts commit a10a10b373f17dc423800e6bb8d1a8e99450090d.

According to Fuel team, this patch will be included into C-2 release
instead of C-1 release, so we have to revert it to the C stable branch.

To revert from C stable branch requires cherry-picking from master
branch, so here it is.

Change-Id: I32e1148e5c1cd24e5696270f1aa328630ef42dd0
Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
(cherry picked from commit 8647dbbe9db84d71610f42cec6ff619783d99800)
---

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 23e440920..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.rpm
-*.deb
-fuel-plugin/.build/
-fuel-plugin/deployment_scripts/puppet/modules/reboot
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index 4c04aa0a6..a396e9472 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -1,16 +1,15 @@
-$kvm_settings = hiera('fuel-plugin-kvm')
+$fuel_settings = parseyaml(file('/etc/astute.yaml'))
 if $operatingsystem == 'Ubuntu' {
-        if $kvm_settings['use_kvm'] {
+        if $fuel_settings['fuel-plugin-kvm']['use_kvm'] {
                 package { 'linux-headers-4.4.6-rt14nfv':
                         ensure => "1.0.OPNFV",
-                        notify => Reboot['after_run'],
                 } ->
                 package { 'linux-image-4.4.6-rt14nfv':
                         ensure => "1.0.OPNFV",
-                        notify => Reboot['after_run'],
-                }
-                reboot { 'after_run':
-                    apply => finished,
+                } ->
+                exec {'reboot':
+                       command => "reboot",
+                       path   => "/usr/bin:/usr/sbin:/bin:/sbin",
                 }
         } else {
         }
diff --git a/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml
index 0aee295c1..f6e31e3ee 100644
--- a/fuel-plugin/deployment_tasks.yaml
+++ b/fuel-plugin/deployment_tasks.yaml
@@ -1,10 +1,10 @@
 - id: kvm_install
   type: puppet
   version: 2.0.0
-  role: [compute]
-  required_for: [post_deployment_end]
-  requires: [post_deployment_start]
+  groups: [compute]
+  required_for: [firewall]
+  requires: [tools]
   parameters:
     puppet_manifest: puppet/manifests/kvm-install.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 1200
+    timeout: 720
diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook
index 259862f8f..a3c883283 100755
--- a/fuel-plugin/pre_build_hook
+++ b/fuel-plugin/pre_build_hook
@@ -4,10 +4,6 @@ set -eux
 
 BUILD_FOR=${BUILD_FOR:-ubuntu}
 DIR="$(dirname `readlink -f $0`)"
-MODULES="${DIR}/deployment_scripts/puppet/modules"
-
-REBOOT_VER='1.2.1'
-REBOOT_URL="https://github.com/puppetlabs/puppetlabs-reboot/archive/${REBOOT_VER}.tar.gz"
 
 function build_pkg {
   case $1 in
@@ -29,7 +25,3 @@ for system in $BUILD_FOR
 do
   build_pkg $system
 done
-
-rm -rf ${MODULES}/reboot
-mkdir -p ${MODULES}/reboot
-wget -qO- ${REBOOT_URL} |  tar -C ${MODULES}/reboot --strip-components=1 -zxvf -