summaryrefslogtreecommitdiff
path: root/lib/ansible/cli/pull.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/cli/pull.py')
-rwxr-xr-xlib/ansible/cli/pull.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py
index f369c390..47084989 100755
--- a/lib/ansible/cli/pull.py
+++ b/lib/ansible/cli/pull.py
@@ -24,7 +24,7 @@ from ansible import constants as C
from ansible import context
from ansible.cli.arguments import option_helpers as opt_help
from ansible.errors import AnsibleOptionsError
-from ansible.module_utils.common.text.converters import to_native, to_text
+from ansible.module_utils._text import to_native, to_text
from ansible.plugins.loader import module_loader
from ansible.utils.cmd_functions import run_cmd
from ansible.utils.display import Display
@@ -81,7 +81,7 @@ class PullCLI(CLI):
super(PullCLI, self).init_parser(
usage='%prog -U <repository> [options] [<playbook.yml>]',
- desc="pulls playbooks from a VCS repo and executes them on target host")
+ desc="pulls playbooks from a VCS repo and executes them for the local host")
# Do not add check_options as there's a conflict with --checkout/-C
opt_help.add_connect_options(self.parser)
@@ -275,15 +275,8 @@ class PullCLI(CLI):
for vault_id in context.CLIARGS['vault_ids']:
cmd += " --vault-id=%s" % vault_id
- if context.CLIARGS['become_password_file']:
- cmd += " --become-password-file=%s" % context.CLIARGS['become_password_file']
-
- if context.CLIARGS['connection_password_file']:
- cmd += " --connection-password-file=%s" % context.CLIARGS['connection_password_file']
-
for ev in context.CLIARGS['extra_vars']:
cmd += ' -e %s' % shlex.quote(ev)
-
if context.CLIARGS['become_ask_pass']:
cmd += ' --ask-become-pass'
if context.CLIARGS['skip_tags']: