Commit Graph

16425 Commits (86ef20c73b76de67782c014a9eef3c3a3aaf49e3)
 

Author SHA1 Message Date
James Cammarata 86ef20c73b Merge branch 'amenonsen-ssh-args' into devel 9 years ago
James Cammarata c28758d2a8 Merge branch 'ssh-args' of https://github.com/amenonsen/ansible into amenonsen-ssh-args 9 years ago
James Cammarata 82faba619e Also add args_path param to powershell shell plugin 9 years ago
James Cammarata 30d481ac57 Fix old-style (non-python) module support 9 years ago
Toshio Kuratomi e40e08d799 Update core sumodule ref to fix docs 9 years ago
Abhijit Menon-Sen ba98c70bea Mention new ssh argument variable in the changelog 9 years ago
Abhijit Menon-Sen b127221f50 Pass default None to getattr, remove repeated call 9 years ago
Abhijit Menon-Sen 478e234bc3 Reword the jump host section in the FAQ
It's just s/extra_args/common_args/, but I reworded some parts to make
things a bit clearer too.

Closes #12335
9 years ago
Abhijit Menon-Sen 96c4dc273a Set explicit default for ANSIBLE_SSH_ARGS
The earlier code behaved exactly as though this default had been set,
but it was actually handled as a(n unnecessary) special case inside the
connection plugin, rather than set as an explicit default.

If the default is overriden either in ansible.cfg or the environment,
the new code will continue to work (in fact, it won't know or care,
since it just uses the value set in the PlayContext).

This is submitted as a separate commit for easier review to address
backwards-compatibility concerns.
9 years ago
Abhijit Menon-Sen 1981bf2b95 Aggregate ssh arguments in PlayContext instead of the connection plugin
Using set_host_overrides() in the connection plugin to access the ssh
argument variables from the inventory didn't see group_vars/host_vars
settings, as noted earlier. Instead, we can set the correct values in
the PlayContext, which has access to all command-line options, task
settings, and variables.

The only downside of doing so is that the source of the settings is no
longer available in ssh.py, and therefore can't be logged. But the code
is simpler, and it actually works.

This change was suggested by @jimi-c in response to the FIXME in the
earlier commit.
9 years ago
Abhijit Menon-Sen 3ad9b4cba6 Rework additional ssh argument handling
Now we have the following ways to set additional arguments:

1. [ssh_connection]ssh_args in ansible.cfg: global setting, prepended to
   every command line for ssh/scp/sftp. Overrides default ControlPersist
   settings.
2. ansible_ssh_common_args inventory variable. Appended to every command
   line for ssh/scp/sftp. Used in addition to ssh_args, if set above, or
   the default settings.
3. ansible_{sftp,scp,ssh}_extra_args inventory variables. Appended to
   every command line for the relevant binary only. Used in addition to
   #1 and #2, if set above, or the default settings.
3. Using the --ssh-common-args or --{sftp,scp,ssh}-extra-args command
   line options (which are overriden by #2 and #3 above).

This preserves backwards compatibility (for ssh_args in ansible.cfg),
but also permits global settings (e.g. ProxyCommand via _common_args) or
ssh-specific options (e.g. -R via ssh_extra_args).

Fixes #12576
9 years ago
Toshio Kuratomi f13d5201b8 Update module refs 9 years ago
Brian Coca 42198a7a59 updated adding os_router and deprecating quantum modules 9 years ago
Brian Coca 4c9f58a152 added no_log censoring to item output
should be last commit that fixes #12214
9 years ago
Brian Coca 5c39538a73 added no_log tests as per #12214 9 years ago
Brian Coca ba4afcbbb6 added no_log to results
normalized outputs to use display class
cleaned up unused imports
9 years ago
Brian Coca c27bd4fab0 {sudo,su}_user does not imply become 9 years ago
James Cammarata 57372906aa Pull host/group vars when adding hosts/groups
Fixes #12582
9 years ago
James Cammarata aa3687d736 Fix syntax error for octal in encrypt methods 9 years ago
James Cammarata 538568305a Submodule pointer update for accelerate module fixes 9 years ago
James Cammarata 8ef78b1cf8 Fixing accelerated connection plugin 9 years ago
Brian Coca 00b8a24299 Merge pull request #12579 from acogdev/devel
Alphabitize retry_files_enabled and retry_files_save_path
9 years ago
Brian Coca 3705d54485 fixed error reporting on splitter 9 years ago
Brian Coca de2f62bd9e fixed error reporting for unkown become user 9 years ago
Brian Coca 6d6bfbc3d2 added missing import for pwd, was being obscured by exception catching and fallback 9 years ago
Brian Coca a680ef66dd fixed vault password file script execution 9 years ago
Brian Coca 6b842d9c49 fixed incorrect data passing on certain events 9 years ago
Brian Coca 2463922306 fixed error reporting when missing redis import 9 years ago
Brian Coca 6e96188085 added missing entry for dealing with bcc 9 years ago
Greg DeKoenigsberg 0a21e2ab4d Add github ID to documentation example 9 years ago
Brian Coca 6ec5abf1c3 fixed some pyflakes 9 years ago
Brian Coca 75f99f873b Merge pull request #12379 from bcoca/document_vars
Document vars

merging so we can push PRs against the common repo
9 years ago
James Cammarata 9c42a4cc69 Merge pull request #12595 from amenonsen/fixups-1
Remove mysterious old cruft
9 years ago
Abhijit Menon-Sen 49b35ad5dd Remove mysterious old cruft
The two lines were added in 2673eb0a and modified in 60e1a1f8, but foo
is completely unused. Removing it doesn't break anything: out it goes!
9 years ago
James Cammarata 775486c9d6 Merge pull request #12589 from jemmyw/consul-http-checks
Update consul integration test with http checks
9 years ago
Brian Coca fe0e4f27ad Merge pull request #12584 from amenonsen/fixups
Remove an unwanted FIXME annotation
ok, confirmed we don't want to support it
9 years ago
Brian Coca 6c190aa8a4 updated ansible-doc to ignore more stuff that has been added to the module repos 9 years ago
Brian Coca 1a56a5c442 created debug method, renamed debug attribute to _debug 9 years ago
James Cammarata deff045aa9 Fix bug caused by options not having start_at_task when used through adhoc
Fixes #12590
9 years ago
Toshio Kuratomi a0920c06e1 Pull submodule refs to fix docs builds 9 years ago
Toshio Kuratomi 4dae7eeca1 Update submodule refs 9 years ago
Toshio Kuratomi 56fa9a5098 Port to v2 API 9 years ago
Toshio Kuratomi d35c9a30fb Minor refactorings 9 years ago
Toshio Kuratomi 888bcd65a8 Create error messages instead of tracebacks. 9 years ago
Abhijit Menon-Sen 93515468c4 Remove an unwanted FIXME annotation
<crab> jimi|ansible: do you think it should be possible to add both
       foo:22 and foo:23 to the inventory?
<jimi|ansible> no

…so we don't want an invitation to FIXME.
9 years ago
Brian Coca 946c56657b Merge pull request #12583 from trondhindenes/windows_docs_improvement
Windows: Updated docs
9 years ago
Trond Hindenes e9786db541 Windows: Updated docs to reflect the new name of get-attr, along with examples 9 years ago
Toshio Kuratomi 4cfcf5d61b Merge pull request #12568 from mgedmin/py3k
Python 3: fix most tests for ansible.module_utils.basic
9 years ago
acogdev e6958df9a8 Put retry_files_enabled and retry_files_save_path into alphabetical order. Found when investigating #11491 9 years ago
Brian Coca 044acdae40 Merge pull request #12578 from trondhindenes/powershell_getattr_improvements2
Windows: Added parameter validation to the get-attr function / Get-AnsibleParam
9 years ago