From 170fc42e8002709f9972c32e4a7b1048f68f8ec4 Mon Sep 17 00:00:00 2001 From: Christopher Galtenberg Date: Tue, 16 May 2017 18:11:12 -0700 Subject: [PATCH] Improve help text for extra-vars requiring @ for filename (cherry picked from commit 1b34de89ee1d75cb7f616b5a34cd5043bf7dfd2b) --- lib/ansible/cli/__init__.py | 2 +- .../web_infrastructure/ansible_tower/tower_job_launch.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index 0796099aec..820d549bdf 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -315,7 +315,7 @@ class CLI(with_metaclass(ABCMeta, object)): action="callback", callback=CLI.unfrack_path, type='str') if runtask_opts: parser.add_option('-e', '--extra-vars', dest="extra_vars", action="append", - help="set additional variables as key=value or YAML/JSON", default=[]) + help="set additional variables as key=value or YAML/JSON, if filename prepend with @", default=[]) if fork_opts: parser.add_option('-f', '--forks', dest='forks', default=C.DEFAULT_FORKS, type='int', diff --git a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_launch.py b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_launch.py index 1fa3d236b0..648e260632 100644 --- a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_launch.py +++ b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_launch.py @@ -54,7 +54,7 @@ options: default: null extra_vars: description: - - Extra_vars to use for the job_template. Use '@' for a file. + - Extra_vars to use for the job_template. Prepend '@' if a file. default: null limit: description: