openstack
/
fuel-agent
Code Issues Proposed changes

Merge "Increase all the grub_timeout defaults to 10sec"

This commit is contained in:
Jenkins 2016-02-15 13:23:55 +00:00 committed by Gerrit Code Review
parent 566c8f5850 7859dbd99c
commit 20d2288eee
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/fuel-agent/fuel-agent.conf.sample
View File

@ -41,7 +41,7 @@
#image_build_suffix=.fuel-agent-image
# Timeout in secs for GRUB (integer value)
#grub_timeout=5
#grub_timeout=10
# Maximum allowed loop devices count to use (integer value)
#max_loop_devices_count=255

2
fuel_agent/manager.py
View File

@ -76,7 +76,7 @@ opts = [
),
cfg.IntOpt(
'grub_timeout',
default=5,
default=10,
help='Timeout in secs for GRUB'
),
cfg.IntOpt(

2
fuel_agent/tests/test_grub_utils.py
View File

@ -398,7 +398,7 @@ class TestGrubUtils(unittest2.TestCase):
mock_initrd.return_value = 'initrd-version'
config = """
default=0
timeout=5
timeout=10
title Default (kernel-version)
kernel /kernel-version kernel-params
initrd /initrd-version

8
fuel_agent/tests/test_manager.py
View File

@ -86,7 +86,7 @@ class TestManager(unittest2.TestCase):
mock_gu.grub1_cfg.assert_called_once_with(
kernel_params='fake_kernel_params root=UUID= ',
initrd='guessed_initrd', kernel='guessed_kernel',
chroot='/tmp/target', grub_timeout=5)
chroot='/tmp/target', grub_timeout=10)
mock_gu.grub1_install.assert_called_once_with(
['/dev/sda', '/dev/sdb', '/dev/sdc'],
'/dev/sda3', chroot='/tmp/target')
@ -116,7 +116,7 @@ class TestManager(unittest2.TestCase):
mock_gu.grub1_cfg.assert_called_once_with(
kernel_params='fake_kernel_params root=UUID= ',
initrd='initrd_name', kernel='kernel_name', chroot='/tmp/target',
grub_timeout=5)
grub_timeout=10)
mock_gu.grub1_install.assert_called_once_with(
['/dev/sda', '/dev/sdb', '/dev/sdc'],
'/dev/sda3', chroot='/tmp/target')
@ -200,7 +200,7 @@ class TestManager(unittest2.TestCase):
initrd='guessed_initrd',
chroot='/tmp/target',
kernel='guessed_kernel',
grub_timeout=5)
grub_timeout=10)
mock_gu.grub1_install.assert_called_once_with(
['/dev/sda', '/dev/sdb', '/dev/sdc'],
'/dev/sda3', chroot='/tmp/target')
@ -224,7 +224,7 @@ class TestManager(unittest2.TestCase):
mock_gu.grub2_cfg.assert_called_once_with(
kernel_params=' console=ttyS0,9600 console=tty0 rootdelay=90 '
'nomodeset root=UUID=fake_UUID ',
chroot='/tmp/target', grub_timeout=5)
chroot='/tmp/target', grub_timeout=10)
mock_gu.grub2_install.assert_called_once_with(
['/dev/sda', '/dev/sdb', '/dev/sdc'],
chroot='/tmp/target')

4
fuel_agent/utils/grub.py
View File

@ -198,7 +198,7 @@ def grub1_stage1(chroot=''):
def grub1_cfg(kernel=None, initrd=None,
kernel_params='', chroot='', grub_timeout=5):
kernel_params='', chroot='', grub_timeout=10):
if not kernel:
kernel = guess_kernel(chroot=chroot)
@ -227,7 +227,7 @@ def grub2_install(install_devices, chroot=''):
utils.execute(*cmd, run_as_root=True, check_exit_code=[0])
def grub2_cfg(kernel_params='', chroot='', grub_timeout=5):
def grub2_cfg(kernel_params='', chroot='', grub_timeout=10):
grub_defaults = chroot + guess_grub2_default(chroot=chroot)
rekerparams = re.compile(r'^.*GRUB_CMDLINE_LINUX=.*')
retimeout = re.compile(r'^.*GRUB_HIDDEN_TIMEOUT=.*')