Merge pull request #12962 from bcoca/pull_fixes

fixes options for ansible pull

docs/man/man1/ansible-pull.1.asciidoc.in

@@ -13,7 +13,7 @@ ansible-pull - pull playbooks from VCS server and run them using this machine as
 
 SYNOPSIS
 --------
-ansible-pull -d DEST -U URL [options] [ <filename.yml> ]
+ansible-pull -U URL [options] [ <filename.yml> ]
 
 
 DESCRIPTION

lib/ansible/cli/pull.py

@@ -50,7 +50,7 @@ class PullCLI(CLI):
         ''' create an options parser for bin/ansible '''
 
         self.parser = CLI.base_parser(
-            usage='%prog <host-pattern> [options]',
+            usage='%prog -U <repository> [options]',
             connect_opts=True,
             vault_opts=True,
             runtask_opts=True,
@@ -67,7 +67,7 @@ class PullCLI(CLI):
             help='sleep for random interval (between 0 and n number of seconds) before starting. This is a useful way to disperse git requests')
         self.parser.add_option('-f', '--force', dest='force', default=False, action='store_true',
             help='run the playbook even if the repository could not be updated')
-        self.parser.add_option('-d', '--directory', dest='dest', default=None, help='directory to checkout repository to')
+        self.parser.add_option('-d', '--directory', dest='dest', default='~/.ansible/pull', help='directory to checkout repository to')
         self.parser.add_option('-U', '--url', dest='url', default=None, help='URL of the playbook repository')
         self.parser.add_option('-C', '--checkout', dest='checkout',
             help='branch/tag/commit to checkout.  ' 'Defaults to behavior of repository module.')
@@ -91,9 +91,6 @@ class PullCLI(CLI):
         if not self.options.url:
             raise AnsibleOptionsError("URL for repository not specified, use -h for help")
 
-        if len(self.args) != 1:
-            raise AnsibleOptionsError("Missing target hosts")
-
         if self.options.module_name not in self.SUPPORTED_REPO_MODULES:
             raise AnsibleOptionsError("Unsuported repo module %s, choices are %s" % (self.options.module_name, ','.join(self.SUPPORTED_REPO_MODULES)))
 
@@ -114,7 +111,7 @@ class PullCLI(CLI):
         # Now construct the ansible command
         node = platform.node()
         host = socket.getfqdn()
-        limit_opts = 'localhost:%s:127.0.0.1' % ':'.join(set([host, node, host.split('.')[0], node.split('.')[0]]))
+        limit_opts = 'localhost,%s,127.0.0.1' % ','.join(set([host, node, host.split('.')[0], node.split('.')[0]]))
         base_opts = '-c local "%s"' % limit_opts
         if self.options.verbosity > 0:
             base_opts += ' -%s' % ''.join([ "v" for x in range(0, self.options.verbosity) ])