Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to ansible-pull and ansible-pull docs #3094

Merged
merged 3 commits into from
Jun 3, 2013
Merged

Updates to ansible-pull and ansible-pull docs #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
291fb9e
Help ansible-pull work better in bootstap environment
sfromm May 21, 2013
a611027
Update ansible-pull documentation
sfromm Jun 2, 2013
355ab69
remove errant and unneeded import of ansible.constants
sfromm Jun 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion bin/ansible-pull
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ def main(args):
parser.add_option('-C', '--checkout', dest='checkout',
default="HEAD",
help='Branch/Tag/Commit to checkout. Defaults to HEAD.')
parser.add_option('-i', '--inventory-file', dest='inventory',
help="specify inventory host file")
options, args = parser.parse_args(args)

if not options.dest:
Expand All @@ -115,9 +117,12 @@ def main(args):
now = datetime.datetime.now()
print >>sys.stderr, now.strftime("Starting ansible-pull at %F %T")

inv_opts = 'localhost,'
limit_opts = 'localhost:%s:127.0.0.1' % socket.getfqdn()
git_opts = "repo=%s dest=%s version=%s" % (options.url, options.dest, options.checkout)
cmd = 'ansible all -c local --limit "%s" -m git -a "%s"' % (limit_opts, git_opts)
cmd = 'ansible all -c local -i "%s" --limit "%s" -m git -a "%s"' % (
inv_opts, limit_opts, git_opts
)
rc = _run(cmd)
if rc != 0:
return rc
Expand All @@ -129,6 +134,8 @@ def main(args):
return 1

cmd = 'ansible-playbook -c local --limit "%s" %s' % (limit_opts, playbook)
if options.inventory:
cmd += ' -i "%s"' % options.inventory
os.chdir(options.dest)
rc = _run(cmd)

Expand Down
21 changes: 20 additions & 1 deletion docs/man/man1/ansible-pull.1.asciidoc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ansible-pull - set up a remote copy of ansible on each managed node

SYNOPSIS
--------
ansible -d DEST -U URL [ -C CHECKOUT ]
ansible -d DEST -U URL [ -C CHECKOUT ] [ -i INVENTORY ] [ <filename.yml> ]


DESCRIPTION
Expand All @@ -35,6 +35,17 @@ ansible-pull runs would be an excellent way to gather and analyze
remote logs from ansible-pull.


OPTIONAL ARGUMENT
-----------------

*filename.yml*::

The name of one the YAML format files to run as an ansible playbook. This can
be a relative path within the git checkout. If not provided, ansible-pull
will look for a playbook based on the host's fully-qualified domain name and
finally a playbook named *local.yml*.


OPTIONS
-------

Expand All @@ -50,6 +61,14 @@ URL of git repository to clone.

Branch/Tag/Commit to checkout. Defaults to 'HEAD'.

*-i* 'PATH', *--inventory=*'PATH'::

The 'PATH' to the inventory hosts file. This can be a relative path within
the git checkout.

*--purge*::

Purge the git checkout after the playbook is run.


AUTHOR
Expand Down