openstack
/
fuel-agent
Code Issues Proposed changes

Merge "Remove NVMe devices workaround due to fixed LP #1551432"

This commit is contained in:
Jenkins 2016-05-16 17:01:23 +00:00 committed by Gerrit Code Review
parent ebff0b0ba1 f8b132442a
commit 3725a02581
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/fuel_bootstrap/files/trusty/etc/multipath.conf
View File

@ -1,6 +0,0 @@
blacklist {
devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
devnode "^hd[a-z]"
devnode "^dcssblk[0-9]*"
devnode "^nvme.*"
}

3
fuel_agent/manager.py
View File

@ -991,8 +991,7 @@ class Manager(object):
bu.do_post_inst(chroot,
hashed_root_password=root.hashed_password,
allow_unsigned_file=CONF.allow_unsigned_file,
force_ipv4_file=CONF.force_ipv4_file,
add_multipath_conf=False)
force_ipv4_file=CONF.force_ipv4_file)
# restore disabled hosts/resolv files
bu.restore_resolv_conf(chroot)
metadata['all_packages'] = bu.get_installed_packages(chroot)

3
fuel_agent/tests/test_build_utils.py
View File

@ -191,7 +191,7 @@ class BuildUtilsTestCase(unittest2.TestCase):
allow_unsigned_file='fake_unsigned',
force_ipv4_file='fake_force_ipv4')
file_handle_mock = mock_open.return_value.__enter__.return_value
file_handle_mock.write.assert_called_with('manual\n')
file_handle_mock.write.assert_called_once_with('manual\n')
mock_exec_expected_calls = [
mock.call('sed',
'-i',
@ -210,7 +210,6 @@ class BuildUtilsTestCase(unittest2.TestCase):
allow_unsigned_file='fake_unsigned',
force_ipv4_file='fake_force_ipv4')
mock_path_join_expected_calls = [
mock.call('chroot', 'etc/multipath.conf'),
mock.call('chroot', 'etc/shadow'),
mock.call('chroot', 'etc/init.d/puppet'),
mock.call('chroot', 'etc/init/mcollective.override'),

13
fuel_agent/utils/build.py
View File

@ -178,18 +178,7 @@ def clean_apt_settings(chroot, allow_unsigned_file='allow_unsigned_packages',
def do_post_inst(chroot, hashed_root_password,
allow_unsigned_file='allow_unsigned_packages',
force_ipv4_file='force_ipv4',
add_multipath_conf=True):
# TODO(isuzdal) Remove after fixing in upstream
# Add multipath-tools blacklist (LP: #1551432)
if add_multipath_conf:
with open(os.path.join(chroot, 'etc/multipath.conf'), 'w') as f:
f.write('# Generated by fuel-agent during provisioning: \n')
f.write('blacklist {\n')
f.write('\tdevnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"\n')
f.write('\tdevnode "^hd[a-z]"\n')
f.write('\tdevnode "^dcssblk[0-9]*"\n')
f.write('\tdevnode "^nvme.*"\n}\n')
force_ipv4_file='force_ipv4'):
# NOTE(agordeev): set up password for root
utils.execute('sed', '-i',
's%root:[\*,\!]%root:' + hashed_root_password + '%',