openstack/cinder
Code Issues Proposed changes

Merge "Skip cryptsetup password quality checking"

Browse Source
This commit is contained in:
Zuul 2020-02-12 19:22:14 +00:00 committed by Gerrit Code Review
commit 3a73123472
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/volume/test_volume.py
View File

@ -1679,6 +1679,7 @@ class VolumeTestCase(base.BaseVolumeTestCase):
mock_execute.assert_called_once_with( mock_execute.assert_called_once_with(
'cryptsetup', 'luksChangeKey', 'cryptsetup', 'luksChangeKey',
'/some/device/thing', '/some/device/thing',
'--force-password',
log_errors=processutils.LOG_ALL_ERRORS, log_errors=processutils.LOG_ALL_ERRORS,
process_input='qwert\nasdfg\n', process_input='qwert\nasdfg\n',
run_as_root=True) run_as_root=True)

2
cinder/volume/flows/manager/create_volume.py
View File

@ -559,6 +559,7 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
'cryptsetup', 'cryptsetup',
'luksChangeKey', 'luksChangeKey',
attach_info['device']['path'], attach_info['device']['path'],
'--force-password',
run_as_root=True, run_as_root=True,
process_input=key_str, process_input=key_str,
log_errors=processutils.LOG_ALL_ERRORS) log_errors=processutils.LOG_ALL_ERRORS)
@ -583,6 +584,7 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
'cryptsetup', 'cryptsetup',
'--batch-mode', '--batch-mode',
'luksFormat', 'luksFormat',
'--force-password',
'--type', encryption['provider'], '--type', encryption['provider'],
'--cipher', encryption['cipher'], '--cipher', encryption['cipher'],
'--key-size', str(encryption['key_size']), '--key-size', str(encryption['key_size']),