Merge "Skip cryptsetup password quality checking"

dr4Ke · Feb 12, 2020 · 3a73123 · 3a73123
2 parents d897936 + 7c36213
commit 3a73123
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cinder/tests/unit/volume/test_volume.py b/cinder/tests/unit/volume/test_volume.py
@@ -1679,6 +1679,7 @@ def test_create_volume_from_volume_with_enc(
                 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)

diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py
@@ -559,6 +559,7 @@ def _rekey_volume(self, context, volume):
                     '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 @@ def _rekey_volume(self, context, volume):
                     'cryptsetup',
                     '--batch-mode',
                     'luksFormat',
+                    '--force-password',
                     '--type', encryption['provider'],
                     '--cipher', encryption['cipher'],
                     '--key-size', str(encryption['key_size']),