From 074ddace354b02c53b8016aded765aec1b732e1f Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Wed, 17 Jun 2020 21:04:50 +0300 Subject: [PATCH] zfs_delegate_admin: add diff,hold,release to list of permissions (#69962) Co-authored-by: Lauri Tirkkonen --- .../69962-zfs_delegate_admin_add_diff_hold_release.yml | 2 ++ lib/ansible/modules/storage/zfs/zfs_delegate_admin.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/69962-zfs_delegate_admin_add_diff_hold_release.yml diff --git a/changelogs/fragments/69962-zfs_delegate_admin_add_diff_hold_release.yml b/changelogs/fragments/69962-zfs_delegate_admin_add_diff_hold_release.yml new file mode 100644 index 00000000000..bffde988205 --- /dev/null +++ b/changelogs/fragments/69962-zfs_delegate_admin_add_diff_hold_release.yml @@ -0,0 +1,2 @@ +bugfixes: + - zfs_delegate_admin - add missing choices diff/hold/release to the permissions parameter (https://github.com/ansible-collections/community.general/pull/278) diff --git a/lib/ansible/modules/storage/zfs/zfs_delegate_admin.py b/lib/ansible/modules/storage/zfs/zfs_delegate_admin.py index 31f80323766..4cb1821f225 100644 --- a/lib/ansible/modules/storage/zfs/zfs_delegate_admin.py +++ b/lib/ansible/modules/storage/zfs/zfs_delegate_admin.py @@ -55,7 +55,7 @@ options: description: - The list of permission(s) to delegate (required if C(state) is C(present)). type: list - choices: [ allow, clone, create, destroy, mount, promote, readonly, receive, rename, rollback, send, share, snapshot, unallow ] + choices: [ allow, clone, create, destroy, diff, hold, mount, promote, readonly, receive, release, rename, rollback, send, share, snapshot, unallow ] local: description: - Apply permissions to C(name) locally (C(zfs allow -l)). @@ -251,8 +251,9 @@ def main(): groups=dict(type='list'), everyone=dict(type='bool', default=False), permissions=dict(type='list', - choices=['allow', 'clone', 'create', 'destroy', 'mount', 'promote', 'readonly', 'receive', - 'rename', 'rollback', 'send', 'share', 'snapshot', 'unallow']), + choices=['allow', 'clone', 'create', 'destroy', 'diff', 'hold', 'mount', 'promote', + 'readonly', 'receive', 'release', 'rename', 'rollback', 'send', 'share', + 'snapshot', 'unallow']), local=dict(type='bool'), descendents=dict(type='bool'), recursive=dict(type='bool', default=False),