Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Revert "[Fuel-plugin] Install kernel in post-deployment.""
[kvmfornfv.git]
/
fuel-plugin
/
deployment_scripts
/
puppet
/
manifests
/
kvm-install.pp
diff --git
a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index
23902cc
..
4c04aa0
100644
(file)
--- 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/compute.yaml')
)
+$
kvm_settings = hiera('fuel-plugin-kvm'
)
if $operatingsystem == 'Ubuntu' {
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",
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",
} ->
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 {
}
}
} else {
}