X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel-plugin%2Fdeployment_scripts%2Fpuppet%2Fmanifests%2Fkvm-install.pp;h=5f14f1a9f34041def8d749078d0c10e368efb0b4;hb=e797a9f954797949f676a46f5c9ceb31874f919a;hp=23902cc37a31a878f8aa2e74093cf770725589af;hpb=7b0d298c1826ff7210b859223d42136dffe7b3ce;p=kvmfornfv.git

diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index 23902cc37..5f14f1a9f 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -1,17 +1,45 @@
-$fuel_settings = parseyaml(file('/etc/compute.yaml'))
-if $operatingsystem == 'Ubuntu' {
-        if $fuel_settings['fuel-plugin-kvm']['use_kvm'] {
-                package { 'linux-headers-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",
-                }
-        } else {
-        }
-} elsif $operatingsystem == 'CentOS' {
+$kvm_settings = hiera('fuel-plugin-kvm')
+
+case $::operatingsystem {
+  'Ubuntu': {
+    $version         = '4.4.50-rt62nfv'
+    $kernel_kit      = ["linux-headers-${version}", "linux-image-${version}"]
+    $kernel_src      = "/usr/src/linux-headers-${version}"
+    $kernel_src_link = "/lib/modules/${version}/build"
+
+    shellvar { 'GRUB_DEFAULT':
+      ensure => present,
+      target => '/etc/default/grub',
+      value  => "Advanced options for Ubuntu>Ubuntu, with Linux ${version}",
+      quoted => 'double',
+      notify => Exec['update_grub'],
+    }
+  }
+  default: {
+    fail("Unsupported operating system: ${::osfamily}/${::operatingsystem}")
+  }
+
+}
+
+if $kvm_settings['use_kvm'] {
+  $ensure_pkg  = '1.0.OPNFV'
+  $ensure_link = 'link'
+} else {
+  $ensure_pkg  = 'purged'
+  $ensure_link = 'absent'
+}
+
+exec { 'update_grub':
+  command     => '/usr/sbin/update-grub',
+  refreshonly => true,
+}
+
+package { $kernel_kit:
+  ensure => $ensure_pkg,
+  before => File[$kernel_src_link],
+}
+
+file { $kernel_src_link:
+  ensure => $ensure_link,
+  target => $kernel_src,
 }