diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | docs/bin/generate_man.py | 244 | ||||
| -rw-r--r-- | docs/docsite/Makefile | 11 | ||||
| -rw-r--r-- | docs/docsite/rst/command_line_tools.rst | 15 | ||||
| -rw-r--r-- | docs/docsite/rst/index.rst | 1 | ||||
| -rw-r--r-- | docs/docsite/rst/vault.rst | 35 | ||||
| -rw-r--r-- | docs/templates/cli_rst.j2 | 139 | ||||
| -rw-r--r-- | docs/templates/man.j2 | 30 | ||||
| -rw-r--r-- | lib/ansible/cli/config.py | 3 |
9 files changed, 403 insertions, 81 deletions
@@ -29,6 +29,7 @@ ASCII2HTMLMAN = a2x -L -D docs/html/man/ -d manpage -f xhtml else ASCII2MAN = @echo "ERROR: AsciiDoc 'a2x' command is not installed but is required to build $(MANPAGES)" && exit 1 endif +GENERATE_CLI = docs/bin/generate_man.py PYTHON=python SITELIB = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") @@ -343,8 +344,9 @@ webdocs: .PHONY: generate_asciidoc generate_asciidoc: lib/ansible/cli/*.py - mkdir -p ./docs/man/man1/ - PYTHONPATH=./lib ./docs/bin/generate_man.py + mkdir -p ./docs/man/man1/ ; \ + PYTHONPATH=./lib $(GENERATE_CLI) --template-file=docs/templates/man.j2 --output-dir=docs/man/man1/ --output-format man lib/ansible/cli/*.py + docs: generate_asciidoc make $(MANPAGES) diff --git a/docs/bin/generate_man.py b/docs/bin/generate_man.py index 52092c570b..e13ffed6f2 100755 --- a/docs/bin/generate_man.py +++ b/docs/bin/generate_man.py @@ -1,6 +1,8 @@ #!/usr/bin/env python +import optparse import os +import pprint import sys from jinja2 import Environment, FileSystemLoader @@ -8,6 +10,46 @@ from jinja2 import Environment, FileSystemLoader from ansible.module_utils._text import to_bytes +def generate_parser(): + p = optparse.OptionParser( + version='%prog 1.0', + usage='usage: %prog [options]', + description='Generate cli documentation from cli docstrings', + ) + + p.add_option("-t", "--template-file", action="store", dest="template_file", default="../templates/man.j2", help="path to jinja2 template") + p.add_option("-o", "--output-dir", action="store", dest="output_dir", default='/tmp/', help="Output directory for rst files") + p.add_option("-f", "--output-format", action="store", dest="output_format", default='man', help="Output format for docs (the default 'man' or 'rst')") + return p + + +# from https://www.python.org/dev/peps/pep-0257/ +def trim_docstring(docstring): + if not docstring: + return '' + # Convert tabs to spaces (following the normal Python rules) + # and split into a list of lines: + lines = docstring.expandtabs().splitlines() + # Determine minimum indentation (first line doesn't count): + indent = sys.maxint + for line in lines[1:]: + stripped = line.lstrip() + if stripped: + indent = min(indent, len(line) - len(stripped)) + # Remove indentation (first line is special): + trimmed = [lines[0].strip()] + if indent < sys.maxint: + for line in lines[1:]: + trimmed.append(line[indent:].rstrip()) + # Strip off trailing and leading blank lines: + while trimmed and not trimmed[-1]: + trimmed.pop() + while trimmed and not trimmed[0]: + trimmed.pop(0) + # Return a single string: + return '\n'.join(trimmed) + + def get_options(optlist): ''' get actual options ''' @@ -24,107 +66,215 @@ def get_options(optlist): return opts +def get_option_groups(option_parser): + groups = [] + for option_group in option_parser.option_groups: + group_info = {} + group_info['desc'] = option_group.get_description() + group_info['options'] = option_group.option_list + group_info['group_obj'] = option_group + groups.append(group_info) + return groups + + def opt_doc_list(cli): ''' iterate over options lists ''' results = [] - for optg in cli.parser.option_groups: - results.extend(get_options(optg.option_list)) + for option_group in cli.parser.option_groups: + results.extend(get_options(option_group.option_list)) results.extend(get_options(cli.parser.option_list)) return results -def opts_docs(cli, name): +# def opts_docs(cli, name): +def opts_docs(cli_class_name, cli_module_name): ''' generate doc structure from options ''' - # cli name - if '-' in name: - name = name.split('-')[1] - else: - name = 'adhoc' + cli_name = 'ansible-%s' % cli_module_name + if cli_module_name == 'adhoc': + cli_name = 'ansible' + + # WIth no action/subcommand + # shared opts set + # instantiate each cli and ask its options + cli_klass = getattr(__import__("ansible.cli.%s" % cli_module_name, + fromlist=[cli_class_name]), cli_class_name) + cli = cli_klass([]) + + # parse the common options + try: + cli.parse() + except: + pass - # cli info + # base/common cli info docs = { - 'cli': name, + 'cli': cli_module_name, + 'cli_name': cli_name, 'usage': cli.parser.usage, 'short_desc': cli.parser.description, - 'long_desc': cli.__doc__, + 'long_desc': trim_docstring(cli.__doc__), + 'actions': {}, } + option_info = {'option_names': [], + 'options': [], + 'groups': []} + + for extras in ('ARGUMENTS'): + if hasattr(cli, extras): + docs[extras.lower()] = getattr(cli, extras) + + common_opts = opt_doc_list(cli) + groups_info = get_option_groups(cli.parser) + shared_opt_names = [] + for opt in common_opts: + shared_opt_names.extend(opt.get('options', [])) + + option_info['options'] = common_opts + option_info['option_names'] = shared_opt_names + + option_info['groups'].extend(groups_info) + + docs.update(option_info) + # now for each action/subcommand # force populate parser with per action options - if cli.VALID_ACTIONS: - docs['actions'] = {} + + # use class attrs not the attrs on a instance (not that it matters here...) + for action in getattr(cli_klass, 'VALID_ACTIONS', ()): + # instantiate each cli and ask its options + action_cli_klass = getattr(__import__("ansible.cli.%s" % cli_module_name, + fromlist=[cli_class_name]), cli_class_name) + # init with args with action added? + cli = action_cli_klass([]) + cli.args.append(action) + + try: + cli.parse() + except: + pass + + # FIXME/TODO: needed? # avoid dupe errors cli.parser.set_conflict_handler('resolve') - for action in cli.VALID_ACTIONS: - cli.args.append(action) - cli.set_action() - docs['actions'][action] = getattr(cli, 'execute_%s' % action).__doc__ - docs['options'] = opt_doc_list(cli) + cli.set_action() + + action_info = {'option_names': [], + 'options': []} + # docs['actions'][action] = {} + # docs['actions'][action]['name'] = action + action_info['name'] = action + action_info['desc'] = trim_docstring(getattr(cli, 'execute_%s' % action).__doc__) + + # docs['actions'][action]['desc'] = getattr(cli, 'execute_%s' % action).__doc__.strip() + action_doc_list = opt_doc_list(cli) + + uncommon_options = [] + for action_doc in action_doc_list: + # uncommon_options = [] + option_aliases = action_doc.get('options', []) + for option_alias in option_aliases: + + if option_alias in shared_opt_names: + continue + + # TODO: use set + if option_alias not in action_info['option_names']: + action_info['option_names'].append(option_alias) + + if action_doc in action_info['options']: + continue + + uncommon_options.append(action_doc) + + action_info['options'] = uncommon_options + + docs['actions'][action] = action_info + + docs['options'] = opt_doc_list(cli) return docs + if __name__ == '__main__': - template_file = 'man.j2' + parser = generate_parser() + + options, args = parser.parse_args() + + template_file = options.template_file + template_path = os.path.expanduser(template_file) + template_dir = os.path.abspath(os.path.dirname(template_path)) + template_basename = os.path.basename(template_file) + output_dir = os.path.abspath(options.output_dir) + output_format = options.output_format + + cli_modules = args + + # various cli parsing things checks sys.argv if the 'args' that are passed in are [] + # so just remove any args so the cli modules dont try to parse them resulting in warnings + sys.argv = [sys.argv[0]] # need to be in right dir os.chdir(os.path.dirname(__file__)) allvars = {} output = {} cli_list = [] - for binary in os.listdir('../../lib/ansible/cli'): + cli_bin_name_list = [] + + # for binary in os.listdir('../../lib/ansible/cli'): + for cli_module_name in cli_modules: + binary = os.path.basename(os.path.expanduser(cli_module_name)) if not binary.endswith('.py'): continue elif binary == '__init__.py': continue - libname = os.path.splitext(binary)[0] - print("Found CLI %s" % libname) + cli_name = os.path.splitext(binary)[0] - if libname == 'adhoc': - myclass = 'AdHocCLI' - output[libname] = 'ansible.1.asciidoc.in' + if cli_name == 'adhoc': + cli_class_name = 'AdHocCLI' + # myclass = 'AdHocCLI' + output[cli_name] = 'ansible.1.asciidoc.in' + cli_bin_name = 'ansible' else: - myclass = "%sCLI" % libname.capitalize() - output[libname] = 'ansible-%s.1.asciidoc.in' % libname + # myclass = "%sCLI" % libname.capitalize() + cli_class_name = "%sCLI" % cli_name.capitalize() + output[cli_name] = 'ansible-%s.1.asciidoc.in' % cli_name + cli_bin_name = 'ansible-%s' % cli_name - # instantiate each cli and ask its options - mycli = getattr(__import__("ansible.cli.%s" % libname, fromlist=[myclass]), myclass) - cli_object = mycli([]) - try: - cli_object.parse() - except: - # no options passed, we expect errors - pass + # FIXME: + allvars[cli_name] = opts_docs(cli_class_name, cli_name) + cli_bin_name_list.append(cli_bin_name) - allvars[libname] = opts_docs(cli_object, libname) + cli_list = allvars.keys() - for extras in ('ARGUMENTS'): - if hasattr(cli_object, extras): - allvars[libname][extras.lower()] = getattr(cli_object, extras) + doc_name_formats = {'man': '%s.1.asciidoc.in', + 'rst': '%s.rst'} - cli_list = allvars.keys() - for libname in cli_list: + for cli_name in cli_list: # template it! - env = Environment(loader=FileSystemLoader('../templates')) - template = env.get_template('man.j2') + env = Environment(loader=FileSystemLoader(template_dir)) + template = env.get_template(template_basename) # add rest to vars - tvars = allvars[libname] + tvars = allvars[cli_name] tvars['cli_list'] = cli_list - tvars['cli'] = libname + tvars['cli_bin_name_list'] = cli_bin_name_list + tvars['cli'] = cli_name if '-i' in tvars['options']: print('uses inventory') manpage = template.render(tvars) - filename = '../man/man1/%s' % output[libname] + filename = os.path.join(output_dir, doc_name_formats[output_format] % tvars['cli_name']) + with open(filename, 'wb') as f: f.write(to_bytes(manpage)) - print("Wrote man docs to %s" % filename) + print("Wrote doc to %s" % filename) diff --git a/docs/docsite/Makefile b/docs/docsite/Makefile index 0b6949571a..6437b1e376 100644 --- a/docs/docsite/Makefile +++ b/docs/docsite/Makefile @@ -4,6 +4,7 @@ FORMATTER=../bin/plugin_formatter.py TESTING_FORMATTER=../bin/testing_formatter.sh DUMPER=../bin/dump_keywords.py CONFIG_DUMPER=../bin/dump_config.py +GENERATE_CLI=../bin/generate_man.py ifeq ($(shell echo $(OS) | egrep -ic 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}') else @@ -19,7 +20,8 @@ all: docs docs: clean htmldocs -htmldocs: testing keywords modules staticmin config +htmldocs: testing keywords modules staticmin cli config + CPUS=$(CPUS) $(MAKE) -f Makefile.sphinx html webdocs: docs @@ -45,9 +47,14 @@ clean: -rm rst/*_maintained.rst -rm rst/playbooks_directives.rst -rm rst/playbooks_keywords.rst +# -rm rst/cli/ansible*.rst .PHONEY: docs clean +# TODO: make generate_man output dir cli option +cli: $(GENERATE_CLI) + PYTHONPATH=../../lib $(GENERATE_CLI) --template-file=../templates/cli_rst.j2 --output-dir=rst/ --output-format rst ../../lib/ansible/cli/*.py + keywords: $(FORMATTER) ../templates/playbooks_keywords.rst.j2 PYTHONPATH=../../lib $(DUMPER) --template-dir=../templates --output-dir=rst/ -d ./keyword_desc.yml @@ -57,7 +64,7 @@ config: modules: $(FORMATTER) ../templates/plugin.rst.j2 # Limit building of module documentation if requested. ifdef MODULES - PYTHONPATH=../../lib $(FORMATTER) -t rst --template-dir=../templates --module-dir=../../lib/ansible/modules -o rst/ -l $(MODULES) + PYTHONPATH=../../lib $(FORMATTER) -t rst --template-dir=../templates --module-dir=../../lib/ansible/modules -o rst/ -l $(MODULES) else PYTHONPATH=../../lib $(FORMATTER) -t rst --template-dir=../templates --module-dir=../../lib/ansible/modules -o rst/ endif diff --git a/docs/docsite/rst/command_line_tools.rst b/docs/docsite/rst/command_line_tools.rst new file mode 100644 index 0000000000..80c8df5bff --- /dev/null +++ b/docs/docsite/rst/command_line_tools.rst @@ -0,0 +1,15 @@ +Command Line Tools +================== + + +.. toctree:: :maxdepth: 1 + + ansible + ansible-playbook + ansible-vault + ansible-galaxy + ansible-console + ansible-config + ansible-doc + ansible-inventory + ansible-pull diff --git a/docs/docsite/rst/index.rst b/docs/docsite/rst/index.rst index ee8f1844be..1dc5a59f4d 100644 --- a/docs/docsite/rst/index.rst +++ b/docs/docsite/rst/index.rst @@ -32,6 +32,7 @@ Ansible, Inc. releases a new major release of Ansible approximately every two mo modules modules_by_category vault + command_line_tools guides dev_guide/index tower diff --git a/docs/docsite/rst/vault.rst b/docs/docsite/rst/vault.rst index 536d21b2cb..4b7fbcaa8e 100644 --- a/docs/docsite/rst/vault.rst +++ b/docs/docsite/rst/vault.rst @@ -5,7 +5,7 @@ Ansible Vault New in Ansible 1.5, "Vault" is a feature of ansible that allows keeping sensitive data such as passwords or keys in encrypted files, rather than as plaintext in your playbooks or roles. These vault files can then be distributed or placed in source control. -To enable this feature, a command line tool, :ref:`ansible-vault` is used to edit files, and a command line flag `--ask-vault-pass` or `--vault-password-file` is used. Alternately, you may specify the location of a password file or command Ansible to always prompt for the password in your ansible.cfg file. These options require no command line flag usage. +To enable this feature, a command line tool - :ref:`ansible-vault` - is used to edit files, and a command line flag (:option:`--ask-vault-pass <ansible-playbook --ask-vault-pass>` or :option:`--vault-password-file <ansible-playbook --vault-password-file>`) is used. Alternately, you may specify the location of a password file or command Ansible to always prompt for the password in your ansible.cfg file. These options require no command line flag usage. For best practices advice, refer to :ref:`best_practices_for_variables_and_vaults`. @@ -48,7 +48,7 @@ The default cipher is AES (which is shared-secret based). Editing Encrypted Files ``````````````````````` -To edit an encrypted file in place, use the :ref:`ansible-vault edit` command. +To edit an encrypted file in place, use the :ref:`ansible-vault edit <ansible_vault_edit>` command. This command will decrypt the file to a temporary file and allow you to edit the file, saving it back when done and removing the temporary file: @@ -78,7 +78,7 @@ Encrypting Unencrypted Files ```````````````````````````` If you have existing files that you wish to encrypt, use -the :ref:`ansible-vault encrypt` command. This command can operate on multiple files at once: +the :ref:`ansible-vault encrypt <ansible_vault_encrypt>` command. This command can operate on multiple files at once: .. code-block:: bash @@ -91,8 +91,8 @@ Decrypting Encrypted Files `````````````````````````` If you have existing files that you no longer want to keep encrypted, you can permanently decrypt -them by running the :ref:`ansible-vault decrypt` command. This command will save them unencrypted -to the disk, so be sure you do not want :ref:`ansible-vault edit` instead: +them by running the :ref:`ansible-vault decrypt <ansible_vault_decrypt>` command. This command will save them unencrypted +to the disk, so be sure you do not want :ref:`ansible-vault edit <ansible_vault_edit>` instead: .. code-block:: bash @@ -106,7 +106,7 @@ Viewing Encrypted Files *Available since Ansible 1.8* -If you want to view the contents of an encrypted file without editing it, you can use the :ref:`ansible-vault view` command: +If you want to view the contents of an encrypted file without editing it, you can use the :ref:`ansible-vault view <ansible_vault_view>` command: .. code-block:: bash @@ -118,10 +118,11 @@ If you want to view the contents of an encrypted file without editing it, you ca Use encrypt_string to create encrypted variables to embed in yaml ````````````````````````````````````````````````````````````````` -The :ref:`ansible-vault encrypt_string` command will encrypt and format a provided string into a format +The :ref:`ansible-vault encrypt_string <ansible_vault_encrypt_string>` command will encrypt and format a provided string into a format that can be included in :ref:`ansible-playbook` YAML files. To encrypt a string provided as a cli arg: + .. code-block:: bash ansible-vault encrypt_string --vault-id a_password_file 'foobar' --name 'the_secret' @@ -224,7 +225,7 @@ Providing Vault Passwords ````````````````````````` Since Ansible 2.4, the recommended way to provide a vault password from the cli is -to use the :option:`--vault-id` cli option. +to use the :option:`--vault-id <ansible-playbook --vault-id>` cli option. For example, to use a password store in the text file :file:`/path/to/my/vault-password-file`: @@ -244,7 +245,7 @@ To get the password from a vault password executable script :file:`my-vault-pass ansible-playbook --vault-id my-vault-password.py -The value for :option:`--vault-id` can specify the type of vault id (prompt, a file path, etc) +The value for :option:`--vault-id <ansible-playbook --vault-id>` can specify the type of vault id (prompt, a file path, etc) and a label for the vault id ('dev', 'prod', 'cloud', etc) For example, to use a password file :file:`dev-password` for the vault-id 'dev': @@ -261,20 +262,20 @@ To prompt for the 'dev' vault id: *Prior to Ansible 2.4* -To be prompted for a vault password, use the :option:`--ask-vault-pass` cli option: +To be prompted for a vault password, use the :option:`--ask-vault-pass <ansible-playbook --vault-id>` cli option: .. code-block:: bash ansible-playbook --ask-vault-pass site.yml -To specify a vault password in a text file 'dev-password', use the :option:`--vault-password-file` option: +To specify a vault password in a text file 'dev-password', use the :option:`--vault-password-file <ansible-playbook --vault-password-file>` option: .. code-block:: bash ansible-playbook --vault-password-file dev-password site.yml There is a config option (:ref:`DEFAULT_VAULT_PASSWORD_FILE`) to specify a vault password file to use -without requiring the :option:`--vault-password-file` cli option. +without requiring the :option:`--vault-password-file <ansible-playbook --vault-password-file>` cli option. via config :ref:`ANSIBLE_VAULT_PASSWORD_FILE` @@ -287,7 +288,7 @@ via env Multiple vault passwords ^^^^^^^^^^^^^^^^^^^^^^^^ -Since Ansible 2.4 and later support using multiple vault passwords, :option:`--vault-id` can +Since Ansible 2.4 and later support using multiple vault passwords, :option:`--vault-id <ansible-playbook --vault-id>` can be provided multiple times. If multiple vault passwords are provided, by default Ansible will attempt to decrypt vault content @@ -302,7 +303,7 @@ For example, to use a 'dev' password read from a file and to be prompted for the In the above case, the 'dev' password will be tried first, then the 'prod' password for cases where Ansible doesn't know which vault id is used to encrypt something. -If the vault content was encrypted using a :option:`--vault-id` option, then the label of the +If the vault content was encrypted using a :option:`--vault-id <ansible-vault --vault-id>` option, then the label of the vault id is stored with the vault content. When Ansible knows the right vault-id, it will try the matching vault id's secret first before trying the rest of the vault-ids. @@ -317,17 +318,17 @@ use. For example, instead of requiring the cli option on every use, the (:ref:`D ansible-playbook --vault-id dev@dev-password --vault-id prod@prompt site.yml -The :option:`--vault-id` can be used in lieu of the :option:`--vault-password-file` or :option:`--ask-vault-pass` options, +The :option:`--vault-id <ansible-playbook --vault-id>` can be used in lieu of the :option:`--vault-password-file <ansible-playbook --vault-password-file>` or :option:`--ask-vault-pass <ansible-playbook --ask-vault-pass>` options, or it can be used in combination with them. -When using :ref:`ansible-vault` command that encrypt content (:ref:`ansible-vault encrypt`, :ref:`ansible-vault encrypt_string`, etc) +When using :ref:`ansible-vault` commands that encrypt content (:ref:`ansible-vault encrypt <ansible_vault_encrypt>`, :ref:`ansible-vault encrypt_string <ansible_vault_encrypt_string>`, etc) only one vault-id can be used. .. note:: Prior to Ansible 2.4, only one vault password could be used in each Ansible run. The - :option:`--vault-id` option is not support prior to Ansible 2.4. + :option:`--vault-id <ansible-playbook --vault-id>` option is not support prior to Ansible 2.4. .. _speeding_up_vault: diff --git a/docs/templates/cli_rst.j2 b/docs/templates/cli_rst.j2 new file mode 100644 index 0000000000..15ca2b3461 --- /dev/null +++ b/docs/templates/cli_rst.j2 @@ -0,0 +1,139 @@ +{% set name = cli_name -%} +{% set name_slug = cli_name -%} + +.. _{{name}}: + +{% set name_len = name|length + 0-%} +{{ '=' * name_len }} +{{name}} +{{ '=' * name_len }} + + +:strong:`{{short_desc|default('')}}` + + +.. contents:: + :local: + :depth: 2 + + +.. program:: {{cli_name}} + +Synopsis +======== + +.. code-block:: bash + + {{ usage|replace('%prog', cli_name) }} + + +Description +=========== + + +{{ long_desc|default('', True) }} + +{% if options %} +Common Options +============== + + +{% for option in options|sort(attribute='options') %} + +.. option:: {% for switch in option['options'] %}{{switch}}{% if option['arg'] %} <{{option['arg']}}>{% endif %}{% if not loop.last %}, {% endif %}{% endfor %} + + {{ option['desc'] }} +{% endfor %} +{% endif %} + +{% if arguments %} +ARGUMENTS +========= + +.. program:: {{cli_name}} + +{% for arg in arguments %} +.. option:: {{ arg }} + + {{ (arguments[arg]|default(' '))}} + +{% endfor %} +{% endif %} + +{% if actions %} +Actions +======= + +{% for action in actions %} + +.. program:: {{cli_name}} {{action}} +.. _{{cli_name|replace('-','_')}}_{{action}}: + +{{ action}} +{{ '-' * action|length}} + +{{ (actions[action]['desc']|default(' '))}} + +{% if actions[action]['options'] %} + + +{% for option in actions[action]['options']|sort %} +.. option:: {% for switch in option['options'] if switch in actions[action]['option_names'] %}{{switch}} {% if option['arg'] %} <{{option['arg']}}>{% endif %}{% if not loop.last %}, {% endif %}{% endfor %} + + {{ (option['desc']) }} +{% endfor %} +{% endif %} + +{% endfor %} +.. program:: {{cli_name}} +{% endif %} + +Environment +=========== + +The following environment variables may be specified. + +{% if inventory %} +:envvar:`ANSIBLE_INVENTORY` -- Override the default ansible inventory file + +{% endif %} +{% if library %} +:envvar:`ANSIBLE_LIBRARY` -- Override the default ansible module library path + +{% endif %} +:envvar:`ANSIBLE_CONFIG` -- Override the default ansible config file + +Many more are available for most options in ansible.cfg + + +Files +===== + +{% if inventory %} +:file:`/etc/ansible/hosts` -- Default inventory file + +{% endif %} +:file:`/etc/ansible/ansible.cfg` -- Config file, used if present + +:file:`~/.ansible.cfg` -- User config file, overrides the default config if present + +Author +====== + +Ansible was originally written by Michael DeHaan. + +See the `AUTHORS` file for a complete list of contributors. + + +Copyright +========= + +Copyright © 2017 Red Hat, Inc | Ansible. + +Ansible is released under the terms of the GPLv3 License. + +See also +======== + +{% for other in cli_bin_name_list|sort %}:manpage:`{{other}}(1)`, {% endfor %} + diff --git a/docs/templates/man.j2 b/docs/templates/man.j2 index 6a7400799b..641d06128b 100644 --- a/docs/templates/man.j2 +++ b/docs/templates/man.j2 @@ -20,8 +20,17 @@ SYNOPSIS DESCRIPTION ----------- -*{{name}}* {{ long_desc|default('', True)|wordwrap }} +{{ long_desc|default('', True)|wordwrap }} +{% if options %} +COMMON OPTIONS +-------------- +{% for option in options|sort(attribute='options') %} +{% for switch in option['options'] %}*{{switch}}*{% if option['arg'] %} '{{option['arg']}}'{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}:: + +{{ option['desc'] }} +{% endfor %} +{% endif %} {% if arguments %} ARGUMENTS @@ -38,22 +47,19 @@ ARGUMENTS {% if actions %} ACTIONS ------- - {% for action in actions %} -{{ action }} + *{{ action }}*::: {{ (actions[action]['desc']|default(' '))|wordwrap}} -{{ (actions[action]|default(' '))|wordwrap}} +{% if actions[action]['options'] %} +{% for option in actions[action]['options']|sort %} +{% for switch in option['options'] if switch in actions[action]['option_names'] %}*{{switch}}*{% if option['arg'] %} '{{option['arg']}}'{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}:: + {{ (option['desc']) }} {% endfor %} {% endif %} -OPTIONS -------- - -{% for option in options|sort(attribute='options') %} -{% for switch in option['options'] %}*{{switch}}* {% if option['arg'] %}'{{option['arg']}}'{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}:: - -{{ option['desc'] }} {% endfor %} +{% endif %} + {% if inventory %} INVENTORY @@ -111,7 +117,7 @@ Ansible is released under the terms of the GPLv3 License. SEE ALSO -------- - {% for other in cli_list|sort %}{% if other != cli %}*ansible{% if other != 'adhoc' %}-{{other}}{% endif %}*(1){% if not loop.last %}, {% endif %}{% endif %}{% endfor %} +{% for other in cli_list|sort %}{% if other != cli %}*ansible{% if other != 'adhoc' %}-{{other}}{% endif %}*(1){% if not loop.last %}, {% endif %}{% endif %}{% endfor %} Extensive documentation is available in the documentation site: <http://docs.ansible.com>. diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index 7cc7716b90..418b998f38 100644 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -56,7 +56,8 @@ class ConfigCLI(CLI): self.parser = CLI.base_parser( usage = "usage: %%prog [%s] [--help] [options] [ansible.cfg]" % "|".join(self.VALID_ACTIONS), - epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0]) + epilog = "\nSee '%s <command> --help' for more information on a specific command.\n\n" % os.path.basename(sys.argv[0]), + desc="View, edit, and manage ansible configuration.", ) self.parser.add_option('-c', '--config', dest='config_file', help="path to configuration file, defaults to first file found in precedence.") |