summaryrefslogtreecommitdiffstats
path: root/fuel-plugin/deployment_scripts/puppet/manifests
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2016-11-28 23:43:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-28 23:43:45 +0000
commit2c8605dc1647ee6a7b7a76c952d2adc6f68be989 (patch)
tree7e1d9eca5d65b1e9a6f8d0b4a1ae242fbdf6c921 /fuel-plugin/deployment_scripts/puppet/manifests
parent8c58d294fb3a6b374579680ef3788fadb78269f9 (diff)
parent860e71785b244ba8e7c5a39c7f738302c5a957c7 (diff)
Merge "Revert "Revert "[Fuel-plugin] Install kernel in post-deployment."""
Diffstat (limited to 'fuel-plugin/deployment_scripts/puppet/manifests')
-rw-r--r--fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp13
1 files changed, 7 insertions, 6 deletions
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index a396e9472..4c04aa0a6 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -1,15 +1,16 @@
-$fuel_settings = parseyaml(file('/etc/astute.yaml'))
+$kvm_settings = hiera('fuel-plugin-kvm')
if $operatingsystem == 'Ubuntu' {
- if $fuel_settings['fuel-plugin-kvm']['use_kvm'] {
+ if $kvm_settings['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",
- } ->
- exec {'reboot':
- command => "reboot",
- path => "/usr/bin:/usr/sbin:/bin:/sbin",
+ notify => Reboot['after_run'],
+ }
+ reboot { 'after_run':
+ apply => finished,
}
} else {
}