Merge branch 'ufw' of git://github.com/Trozz/ansible into devel

This commit is contained in:
Michael DeHaan 2014-07-28 12:08:29 -04:00
commit b69f096e8a
2 changed files with 8 additions and 0 deletions

View file

@ -113,6 +113,9 @@ def get_man_text(doc):
if 'choices' in opt:
choices = ", ".join(str(i) for i in opt['choices'])
desc = desc + " (Choices: " + choices + ")"
if 'default' in opt:
default = str(opt['default'])
desc = desc + " [Default: " + default + "]"
text.append("%s\n" % textwrap.fill(tty_ify(desc), initial_indent=opt_indent,
subsequent_indent=opt_indent))

View file

@ -108,6 +108,11 @@ options:
- Delete rule.
required: false
choices: ['yes', 'no']
interface:
description:
- Specify interface for rule.
required: false
aliases: ['if']
'''
EXAMPLES = '''