summaryrefslogtreecommitdiffstats
path: root/fuel-plugin/deployment_scripts
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-09-18 14:16:16 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-09-19 15:43:26 +0000
commite6588d1d59d7ac24f25f644650e6845561dd441b (patch)
treeef1507901cc8f02bb41d8afc90708e4581475c78 /fuel-plugin/deployment_scripts
parente5900e6aa4fad9bacacc3f07912c7f2f694cc332 (diff)
[Fuel-plugin] Install kernel in post-deployment.
Install kernel and reboot compute nodes in post-deployment phase when there is less chance to interfere with other tasks. Implement Michael's suggestion to use reboot puppet module. Change-Id: I83867e5e2752c39d2b69c950e3e475d43de04466 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit a10a10b373f17dc423800e6bb8d1a8e99450090d)
Diffstat (limited to 'fuel-plugin/deployment_scripts')
-rw-r--r--fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp13
-rw-r--r--fuel-plugin/deployment_scripts/puppet/modules/.gitkeep0
2 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 {
}
diff --git a/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/fuel-plugin/deployment_scripts/puppet/modules/.gitkeep