Merge branch 'option-updates' of git://github.com/jlund/ansible into devel

Conflicts:
	bin/ansible-pull
This commit is contained in:
Michael DeHaan
2013-06-30 19:31:37 -04:00
4 changed files with 14 additions and 18 deletions

View File

@@ -98,18 +98,18 @@ def main(args):
usage = "%prog [options] [playbook.yml]"
parser = OptionParser(usage=usage)
parser.add_option('--purge', default=False, action='store_true',
help='Purge git checkout after playbook run')
help='purge git checkout after playbook run')
parser.add_option('-o', '--only-if-changed', dest='ifchanged', default=False, action='store_true',
help='Only run the playbook if the repository has been updated')
help='only run the playbook if the repository has been updated')
parser.add_option('-d', '--directory', dest='dest', default=None,
help='Directory to clone git repository to')
help='directory to clone the git repository to')
parser.add_option('-U', '--url', dest='url', default=None,
help='URL of git repository')
help='URL of the git repository')
parser.add_option('-C', '--checkout', dest='checkout',
default="HEAD",
help='Branch/Tag/Commit to checkout. Defaults to HEAD.')
help='branch/tag/commit to checkout; defaults to HEAD')
parser.add_option('-i', '--inventory-file', dest='inventory',
help="specify inventory host file")
help="location of the inventory host file")
options, args = parser.parse_args(args)
if not options.dest: