Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filesystem: fix documentation #36556

Merged
merged 1 commit into from
Feb 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/ansible/modules/system/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
- since 2.5, I(dev) can be an image file.
- vfat support was added in 2.5
required: yes
aliases: [type]
dev:
description:
- Target path to device or image file.
required: yes
aliases: [device]
force:
description:
- If C(yes), allows to create new filesystem on devices that already has filesystem.
Expand Down Expand Up @@ -276,11 +278,13 @@ def main():
'lvm': 'LVM2_member',
}

fstypes = set(FILESYSTEMS.keys()) - set(friendly_names.values()) | set(friendly_names.keys())

# There is no "single command" to manipulate filesystems, so we map them all out and their options
module = AnsibleModule(
argument_spec=dict(
fstype=dict(required=True, aliases=['type'],
choices=list(FILESYSTEMS.keys()) + list(friendly_names.keys())),
choices=list(fstypes)),
dev=dict(required=True, aliases=['device']),
opts=dict(),
force=dict(type='bool', default=False),
Expand Down
2 changes: 0 additions & 2 deletions test/sanity/validate-modules/ignore.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2796,8 +2796,6 @@ lib/ansible/modules/system/beadm.py E325
lib/ansible/modules/system/beadm.py E326
lib/ansible/modules/system/capabilities.py E322
lib/ansible/modules/system/debconf.py E326
lib/ansible/modules/system/filesystem.py E322
lib/ansible/modules/system/filesystem.py E326
lib/ansible/modules/system/firewalld.py E322
lib/ansible/modules/system/firewalld.py E324
lib/ansible/modules/system/firewalld.py E325
Expand Down