From 8647dbbe9db84d71610f42cec6ff619783d99800 Mon Sep 17 00:00:00 2001 From: Yunhong Jiang Date: Wed, 21 Sep 2016 14:05:24 -0700 Subject: 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 --- .../deployment_scripts/puppet/manifests/kvm-install.pp | 13 ++++++------- fuel-plugin/deployment_scripts/puppet/modules/.gitkeep | 0 2 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 fuel-plugin/deployment_scripts/puppet/modules/.gitkeep (limited to 'fuel-plugin/deployment_scripts') 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 -- cgit 1.2.3-korg