openstack
/
fuel-agent
Code Issues Proposed changes

Merge "Remove extra root= kernel parameter"

This commit is contained in:
Jenkins 2016-07-29 08:38:30 +00:00 committed by Gerrit Code Review
parent 2597c6a26e 47e8b24a12
commit 095987ab05
3 changed files with 14 additions and 6 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

@ -71,6 +71,8 @@
# Add udev rules for NIC remapping (boolean value)
#fix_udev_net_rules=true
# Add extra "root=UUID" option to the kernel cmdline (boolean value)
# use_uuid_root=false
#
# Options defined in fuel_agent.cmd.agent

9
fuel_agent/manager.py
View File

@ -178,6 +178,11 @@ opts = [
'default_root_password',
default='r00tme',
help='Default password for root user',
),
cfg.BoolOpt(
'use_uuid_root',
default=False,
help='Add extra "root=UUID" option to the kernel cmdline'
)
]
@ -895,8 +900,8 @@ class Manager(object):
boot_device = self.driver.partition_scheme.boot_device(grub.version)
install_devices = [d.name for d in self.driver.partition_scheme.parteds
if d.install_bootloader]
grub.append_kernel_params('root=UUID=%s ' % mount2uuid['/'])
if CONF.use_uuid_root:
grub.append_kernel_params('root=UUID=%s ' % mount2uuid['/'])
kernel = grub.kernel_name or gu.guess_kernel(chroot=chroot,
regexp=grub.kernel_regexp)

9
fuel_agent/tests/test_manager.py
View File

@ -88,7 +88,7 @@ class TestManager(unittest2.TestCase):
self.assertFalse(mock_gu.grub2_cfg.called)
self.assertFalse(mock_gu.grub2_install.called)
mock_gu.grub1_cfg.assert_called_once_with(
kernel_params='fake_kernel_params root=UUID= ',
kernel_params='fake_kernel_params',
initrd='guessed_initrd', kernel='guessed_kernel',
chroot='/tmp/target', grub_timeout=10)
mock_gu.grub1_install.assert_called_once_with(
@ -122,7 +122,7 @@ class TestManager(unittest2.TestCase):
self.assertFalse(mock_gu.grub2_cfg.called)
self.assertFalse(mock_gu.grub2_install.called)
mock_gu.grub1_cfg.assert_called_once_with(
kernel_params='fake_kernel_params root=UUID= ',
kernel_params='fake_kernel_params',
initrd='initrd_name', kernel='kernel_name', chroot='/tmp/target',
grub_timeout=10)
mock_gu.grub1_install.assert_called_once_with(
@ -149,6 +149,7 @@ class TestManager(unittest2.TestCase):
return ('FAKE_ROOTFS_UUID', None)
else:
return ('FAKE_UUID', None)
CONF.use_uuid_root = True
mock_hw.is_multipath_device.return_value = False
mock_utils.execute.side_effect = _fake_uuid
mock_grub.version = 2
@ -219,7 +220,7 @@ class TestManager(unittest2.TestCase):
chroot='/tmp/target')
mock_gu.grub1_cfg.assert_called_once_with(
kernel_params=' console=ttyS0,9600 console=tty0 rootdelay=90 '
'nomodeset root=UUID=fake_UUID ',
'nomodeset',
initrd='guessed_initrd',
chroot='/tmp/target',
kernel='guessed_kernel',
@ -249,7 +250,7 @@ class TestManager(unittest2.TestCase):
chroot='/tmp/target')
mock_gu.grub2_cfg.assert_called_once_with(
kernel_params=' console=ttyS0,9600 console=tty0 rootdelay=90 '
'nomodeset root=UUID=fake_UUID ',
'nomodeset',
chroot='/tmp/target', grub_timeout=10)
mock_gu.grub2_install.assert_called_once_with(
['/dev/sda', '/dev/sdb', '/dev/sdc'],