Merge pull request #22666 from msteed/issue_22239

Update salt-call manpage to match cli help text
This commit is contained in:
Nicole Thomas 2015-04-14 13:24:03 -06:00
commit c0d1bdd60b

View file

@ -22,14 +22,18 @@ Options
.. include:: _includes/common-options.rst
.. option:: --hard-crash
Raise any original exception rather than exiting gracefully Default: False
.. option:: -g, --grains
Return the information generated by the Salt grains
.. option:: -m MODULE_DIRS, --module-dirs=MODULE_DIRS
Specify an additional directories to pull modules from, multiple
directories can be delimited by commas
Specify an additional directory to pull modules from. Multiple directories
can be provided by passing -m /--module-dirs multiple times.
.. option:: -d, --doc, --documentation
@ -53,6 +57,36 @@ Options
Run salt-call locally, as if there was no master running.
.. option:: --file-root=FILE_ROOT
Set this directory as the base file root.
.. option:: --pillar-root=PILLAR_ROOT
Set this directory as the base pillar root.
.. option:: --retcode-passthrough
Exit with the salt call retcode and not the salt binary retcode
.. option:: --metadata
Print out the execution metadata as well as the return. This will print out
the outputter data, the return code, etc.
.. option:: --id=ID
Specify the minion id to use. If this option is omitted, the id option from
the minion config will be used.
.. option:: --skip-grains
Do not load grains.
.. option:: --refresh-grains-cache
Force a refresh of the grains cache
.. include:: _includes/logging-options.rst
.. |logfile| replace:: /var/log/salt/minion
.. |loglevel| replace:: ``info``