summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2019-01-11 03:49:43 -0500
committerToshio Kuratomi <a.badger@gmail.com>2019-01-14 12:34:39 -0800
commitd20040296bc7b51187f2cb8612ccd6f63f61a706 (patch)
treedc4eab86fe412b17fb68d8f9dd9195e3defaf0f1
parent41c98d208b1419dcf4d1349541cac3251cc157cf (diff)
downloadansible-d20040296bc7b51187f2cb8612ccd6f63f61a706.tar.gz
added missing docs for option in acl module (#50775)
* added missing docs for option in acl module * remove acl from ignore (cherry picked from commit 91d83838988d95822c23a578243d5ead4c493564)
-rw-r--r--changelogs/fragments/acl_doc_fix.yml2
-rw-r--r--lib/ansible/modules/files/acl.py7
-rw-r--r--test/sanity/validate-modules/ignore.txt2
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/fragments/acl_doc_fix.yml b/changelogs/fragments/acl_doc_fix.yml
new file mode 100644
index 0000000000..de66ee3180
--- /dev/null
+++ b/changelogs/fragments/acl_doc_fix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - document old option that was initally missed
diff --git a/lib/ansible/modules/files/acl.py b/lib/ansible/modules/files/acl.py
index df2d668c6f..2368e7473d 100644
--- a/lib/ansible/modules/files/acl.py
+++ b/lib/ansible/modules/files/acl.py
@@ -73,7 +73,12 @@ options:
type: bool
default: 'no'
version_added: "2.0"
-
+ use_nfsv4_acls:
+ description:
+ - Use NFSv4 ACLs instead of POSIX ACLs.
+ type: bool
+ default: no
+ version_added: '2.2'
recalculate_mask:
description:
- Select if and when to recalculate the effective right masks of the files, see setfacl documentation for more info. Incompatible with C(state=query).
diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt
index 056af5a367..01722516e7 100644
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@@ -552,8 +552,6 @@ lib/ansible/modules/database/vertica/vertica_role.py E322
lib/ansible/modules/database/vertica/vertica_schema.py E322
lib/ansible/modules/database/vertica/vertica_user.py E322
lib/ansible/modules/database/vertica/vertica_user.py E325
-lib/ansible/modules/files/acl.py E322
-lib/ansible/modules/files/acl.py E325
lib/ansible/modules/files/assemble.py E323
lib/ansible/modules/files/assemble.py E324
lib/ansible/modules/files/blockinfile.py E324