diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index c2ae98b1b8..c1108d08a5 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -222,6 +222,8 @@ class CLI(object): help="specify path(s) to module library (default=%s)" % C.DEFAULT_MODULE_PATH, default=None) parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append", help="set additional variables as key=value or YAML/JSON", default=[]) + parser.add_option('-l', '--limit', default=C.DEFAULT_SUBSET, dest='subset', + help='further limit selected hosts to an additional pattern') if fork_opts: parser.add_option('-f','--forks', dest='forks', default=C.DEFAULT_FORKS, type='int', @@ -235,8 +237,6 @@ class CLI(object): if subset_opts: - parser.add_option('-l', '--limit', default=C.DEFAULT_SUBSET, dest='subset', - help='further limit selected hosts to an additional pattern') parser.add_option('-t', '--tags', dest='tags', default='all', help="only run plays and tasks tagged with these values") parser.add_option('--skip-tags', dest='skip_tags', diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py index 76cba0749f..0c28a20248 100644 --- a/lib/ansible/cli/pull.py +++ b/lib/ansible/cli/pull.py @@ -144,8 +144,6 @@ class PullCLI(CLI): self.display.display("Sleeping for %d seconds..." % self.options.sleep) time.sleep(self.options.sleep); - import q - q(cmd) # RUN the Checkout command rc, out, err = run_cmd(cmd, live=True)