Merge pull request #2895 from jpmens/docreqs

Add Requirements to rst template, ansible-doc
This commit is contained in:
Michael DeHaan 2013-05-11 11:41:20 -07:00
commit de74cfd85e

View file

@ -82,8 +82,11 @@ options:
required: false required: false
default: "yes" default: "yes"
choices: [ "yes", "safe", "full", "dist"] choices: [ "yes", "safe", "full", "dist"]
requirements: [ python-apt, aptitude ]
author: Matthew Williams author: Matthew Williams
notes: [] notes:
- Two of the upgrade modes (C(full) and C(dist)) require C(aptitude), otherwise
C(apt-get) suffices.
examples: examples:
- code: "apt: pkg=foo update_cache=yes" - code: "apt: pkg=foo update_cache=yes"
description: Update repositories cache and install C(foo) package description: Update repositories cache and install C(foo) package
@ -103,7 +106,6 @@ examples:
description: Run the equivalent of C(apt-get update) as a separate step description: Run the equivalent of C(apt-get update) as a separate step
- code: "apt: update_cache=yes cache_valid_time=3600" - code: "apt: update_cache=yes cache_valid_time=3600"
description: Only run C(update_cache=yes) if the last one is more than more than 3600 seconds ago description: Only run C(update_cache=yes) if the last one is more than more than 3600 seconds ago
requirements: [ python-apt, aptitude ]
''' '''
import traceback import traceback