summaryrefslogtreecommitdiffstats
path: root/fuel-plugin/deployment_scripts/puppet
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-29 11:14:30 +0400
committerJiang, Yunhong <yunhong.jiang@intel.com>2017-03-30 23:14:09 +0000
commit4375b689ffa0f2f37c04fef7c25aaf9473ba8582 (patch)
tree6dfdfe688f7ac9e2260bb6aabf60ef08e494b88f /fuel-plugin/deployment_scripts/puppet
parent8815494ebba1bbb37ab0a9f9700f5dfb33cf12fb (diff)
[fuel-plugin] Set default grub entry for kernel
JIRA: KVMFORNFV-77 Change-Id: Ibb764cd5fa9822d337ce6f948bff8213c1caa7eb Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com> Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit e797a9f954797949f676a46f5c9ceb31874f919a)
Diffstat (limited to 'fuel-plugin/deployment_scripts/puppet')
-rw-r--r--fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp13
1 files changed, 13 insertions, 0 deletions
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
index fba3e38ce..a723574d1 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp
@@ -6,6 +6,14 @@ case $::operatingsystem {
$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}")
@@ -21,6 +29,11 @@ if $kvm_settings['use_kvm'] {
$ensure_link = 'absent'
}
+exec { 'update_grub':
+ command => '/usr/sbin/update-grub',
+ refreshonly => true,
+}
+
package { $kernel_kit:
ensure => $ensure_pkg,
before => File[$kernel_src_link],