summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-29 11:14:30 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-03-29 11:21:55 +0400
commite797a9f954797949f676a46f5c9ceb31874f919a (patch)
tree2ea67e5d0d69b531f2f61f6226c0b110be216bac
parent3a2eb75a5ba494161655c84a23d11eb9f6a797e9 (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>
-rw-r--r--fuel-plugin/deployment_scripts/puppet/manifests/kvm-install.pp13
-rwxr-xr-xfuel-plugin/pre_build_hook8
2 files changed, 21 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 0ca9a8d38..5f14f1a9f 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],
diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook
index a3c883283..7d9aa155f 100755
--- a/fuel-plugin/pre_build_hook
+++ b/fuel-plugin/pre_build_hook
@@ -4,6 +4,10 @@ set -eux
BUILD_FOR=${BUILD_FOR:-ubuntu}
DIR="$(dirname `readlink -f $0`)"
+MODULES="${DIR}/deployment_scripts/puppet/modules"
+
+SHELLVAR_VERSION='2.2.1'
+SHELLVAR_URL="https://github.com/hercules-team/augeasproviders_shellvar/archive/${SHELLVAR_VERSION}.tar.gz"
function build_pkg {
case $1 in
@@ -25,3 +29,7 @@ for system in $BUILD_FOR
do
build_pkg $system
done
+
+rm -rf ${MODULES}/shellvar
+mkdir -p ${MODULES}/shellvar
+wget -qO- ${SHELLVAR_URL} | tar -C ${MODULES}/shellvar --strip-components=1 -zxvf -