mirror of
https://github.com/ansible-collections/community.crypto.git
synced 2026-05-06 21:33:00 +00:00
add allow discard option for luks devices (#693)
* add allow discard option for luks devices * Add allow_discards to perfomance tests * Fix version for luks devices doc * Update plugins/modules/luks_device.py Co-authored-by: Felix Fontein <felix@fontein.de> * add changelog fragment * Update changelogs/fragments/693-allow-discards.yaml Co-authored-by: Felix Fontein <felix@fontein.de> * added allow_discards to the persistently stored option list * allow_discards works with not only luks2 containers * Update plugins/modules/luks_device.py Co-authored-by: Felix Fontein <felix@fontein.de> --------- Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
@@ -293,13 +293,20 @@ options:
|
||||
persistent:
|
||||
description:
|
||||
- "Allows the user to store options into container's metadata persistently and automatically use them next time.
|
||||
Only O(perf_same_cpu_crypt), O(perf_submit_from_crypt_cpus), O(perf_no_read_workqueue), and O(perf_no_write_workqueue)
|
||||
can be stored persistently."
|
||||
Only O(perf_same_cpu_crypt), O(perf_submit_from_crypt_cpus), O(perf_no_read_workqueue), O(perf_no_write_workqueue),
|
||||
and O(allow_discards) can be stored persistently."
|
||||
- "Will only work with LUKS2 containers."
|
||||
- "Will only be used when opening containers."
|
||||
type: bool
|
||||
default: false
|
||||
version_added: '2.3.0'
|
||||
allow_discards:
|
||||
description:
|
||||
- "Allow discards (also known as TRIM) requests for device."
|
||||
- "Will only be used when opening containers."
|
||||
type: bool
|
||||
default: false
|
||||
version_added: '2.17.0'
|
||||
|
||||
requirements:
|
||||
- "cryptsetup"
|
||||
@@ -646,7 +653,7 @@ class CryptHandler(Handler):
|
||||
% (device, result[STDERR]))
|
||||
|
||||
def run_luks_open(self, device, keyfile, passphrase, perf_same_cpu_crypt, perf_submit_from_crypt_cpus,
|
||||
perf_no_read_workqueue, perf_no_write_workqueue, persistent, name):
|
||||
perf_no_read_workqueue, perf_no_write_workqueue, persistent, allow_discards, name):
|
||||
args = [self._cryptsetup_bin]
|
||||
if keyfile:
|
||||
args.extend(['--key-file', keyfile])
|
||||
@@ -660,6 +667,8 @@ class CryptHandler(Handler):
|
||||
args.extend(['--perf-no_write_workqueue'])
|
||||
if persistent:
|
||||
args.extend(['--persistent'])
|
||||
if allow_discards:
|
||||
args.extend(['--allow-discards'])
|
||||
args.extend(['open', '--type', 'luks', device, name])
|
||||
|
||||
result = self._run_command(args, data=passphrase)
|
||||
@@ -983,6 +992,7 @@ def run_module():
|
||||
perf_no_read_workqueue=dict(type='bool', default=False),
|
||||
perf_no_write_workqueue=dict(type='bool', default=False),
|
||||
persistent=dict(type='bool', default=False),
|
||||
allow_discards=dict(type='bool', default=False),
|
||||
)
|
||||
|
||||
mutually_exclusive = [
|
||||
@@ -1075,6 +1085,7 @@ def run_module():
|
||||
module.params['perf_no_read_workqueue'],
|
||||
module.params['perf_no_write_workqueue'],
|
||||
module.params['persistent'],
|
||||
module.params['allow_discards'],
|
||||
name)
|
||||
except ValueError as e:
|
||||
module.fail_json(msg="luks_device error: %s" % e)
|
||||
|
||||
Reference in New Issue
Block a user