Browse Source

Merge "Skip cryptsetup password quality checking"

tags/16.0.0.0b1
Zuul 1 week ago
parent
commit
3a73123472
2 changed files with 3 additions and 0 deletions
  1. +1
    -0
      cinder/tests/unit/volume/test_volume.py
  2. +2
    -0
      cinder/volume/flows/manager/create_volume.py

+ 1
- 0
cinder/tests/unit/volume/test_volume.py View File

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

+ 2
- 0
cinder/volume/flows/manager/create_volume.py View File

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

Loading…
Cancel
Save