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.
2015-10-02 21:26:25 +05:30
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
2015-10-02 21:26:25 +05:30
Toshio Kuratomi
f13d5201b8
Update module refs
2015-10-02 08:34:05 -07:00
Brian Coca
42198a7a59
updated adding os_router and deprecating quantum modules
2015-10-02 10:14:17 -04:00
Brian Coca
4c9f58a152
added no_log censoring to item output
...
should be last commit that fixes #12214
2015-10-02 09:11:41 -04:00
Brian Coca
5c39538a73
added no_log tests as per #12214
2015-10-02 09:11:41 -04:00
Brian Coca
ba4afcbbb6
added no_log to results
...
normalized outputs to use display class
cleaned up unused imports
2015-10-02 09:11:41 -04:00
Brian Coca
c27bd4fab0
{sudo,su}_user does not imply become
2015-10-02 09:11:41 -04:00
James Cammarata
57372906aa
Pull host/group vars when adding hosts/groups
...
Fixes #12582
2015-10-02 02:47:09 -04:00
James Cammarata
aa3687d736
Fix syntax error for octal in encrypt methods
2015-10-02 02:27:57 -04:00
James Cammarata
538568305a
Submodule pointer update for accelerate module fixes
2015-10-02 00:50:02 -04:00
James Cammarata
8ef78b1cf8
Fixing accelerated connection plugin
2015-10-02 00:50:02 -04:00
Brian Coca
00b8a24299
Merge pull request #12579 from acogdev/devel
...
Alphabitize retry_files_enabled and retry_files_save_path
2015-10-01 20:01:04 -04:00
Brian Coca
3705d54485
fixed error reporting on splitter
2015-10-01 19:03:04 -04:00
Brian Coca
de2f62bd9e
fixed error reporting for unkown become user
2015-10-01 18:58:16 -04:00
Brian Coca
6d6bfbc3d2
added missing import for pwd, was being obscured by exception catching and fallback
2015-10-01 18:56:30 -04:00
Brian Coca
a680ef66dd
fixed vault password file script execution
2015-10-01 18:49:51 -04:00
Brian Coca
6b842d9c49
fixed incorrect data passing on certain events
2015-10-01 18:49:51 -04:00
Brian Coca
2463922306
fixed error reporting when missing redis import
2015-10-01 18:49:51 -04:00
Brian Coca
6e96188085
added missing entry for dealing with bcc
2015-10-01 18:49:51 -04:00
Greg DeKoenigsberg
0a21e2ab4d
Add github ID to documentation example
2015-10-01 14:20:06 -04:00
Brian Coca
6ec5abf1c3
fixed some pyflakes
2015-10-01 14:14:20 -04:00
Brian Coca
75f99f873b
Merge pull request #12379 from bcoca/document_vars
...
Document vars
merging so we can push PRs against the common repo
2015-10-01 12:57:51 -04:00
James Cammarata
9c42a4cc69
Merge pull request #12595 from amenonsen/fixups-1
...
Remove mysterious old cruft
2015-10-01 11:32:18 -04:00
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!
2015-10-01 20:32:08 +05:30
James Cammarata
775486c9d6
Merge pull request #12589 from jemmyw/consul-http-checks
...
Update consul integration test with http checks
2015-10-01 10:44:31 -04:00
Brian Coca
fe0e4f27ad
Merge pull request #12584 from amenonsen/fixups
...
Remove an unwanted FIXME annotation
ok, confirmed we don't want to support it
2015-10-01 10:24:58 -04:00
Brian Coca
6c190aa8a4
updated ansible-doc to ignore more stuff that has been added to the module repos
2015-10-01 10:17:41 -04:00
Brian Coca
1a56a5c442
created debug method, renamed debug attribute to _debug
2015-10-01 10:17:41 -04:00
James Cammarata
deff045aa9
Fix bug caused by options not having start_at_task when used through adhoc
...
Fixes #12590
2015-10-01 10:09:58 -04:00
Toshio Kuratomi
a0920c06e1
Pull submodule refs to fix docs builds
2015-09-30 19:57:55 -07:00
Toshio Kuratomi
4dae7eeca1
Update submodule refs
2015-09-30 19:41:56 -07:00
Toshio Kuratomi
56fa9a5098
Port to v2 API
2015-09-30 19:39:07 -07:00
Toshio Kuratomi
d35c9a30fb
Minor refactorings
2015-09-30 19:39:06 -07:00
Toshio Kuratomi
888bcd65a8
Create error messages instead of tracebacks.
2015-09-30 19:39:06 -07:00
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.
2015-10-01 06:56:29 +05:30
Brian Coca
946c56657b
Merge pull request #12583 from trondhindenes/windows_docs_improvement
...
Windows: Updated docs
2015-09-30 19:32:10 -04:00
Trond Hindenes
e9786db541
Windows: Updated docs to reflect the new name of get-attr, along with examples
2015-09-30 23:29:05 +02:00
Toshio Kuratomi
4cfcf5d61b
Merge pull request #12568 from mgedmin/py3k
...
Python 3: fix most tests for ansible.module_utils.basic
2015-09-30 12:47:29 -07:00
acogdev
e6958df9a8
Put retry_files_enabled and retry_files_save_path into alphabetical order. Found when investigating #11491
2015-09-30 13:41:51 -06:00
Brian Coca
044acdae40
Merge pull request #12578 from trondhindenes/powershell_getattr_improvements2
...
Windows: Added parameter validation to the get-attr function / Get-AnsibleParam
2015-09-30 15:23:14 -04:00
Trond Hindenes
94cfbe7ee9
Get-AnsibleParam
2015-09-30 21:02:12 +02:00
James Cammarata
dcb8caf9e8
Remember if we already skipped tasks via --start-at-task
...
Fixes #12482
2015-09-30 14:12:38 -04:00
chouseknecht
57adf11262
Fix metadata description for galaxy_tags.
2015-09-30 13:36:28 -04:00
chouseknecht
f4690e3bfe
Changing tag to galaxy_tag.
2015-09-30 13:36:23 -04:00
chouseknecht
8360a1b3f2
Replace categories with tags.
...
Also added --ignore-certs option for use with install and search commands. Helpful when
overriding server and server has self signed cert.
2015-09-30 13:36:17 -04:00
Brian Coca
6d8abe84e4
Merge pull request #12572 from amenonsen/vault-pager
...
Make ansible-vault view not write plaintext to a tempfile
2015-09-30 12:50:59 -04:00
Abhijit Menon-Sen
0bb34fd076
Make «ansible-vault view» not write plaintext to a tempfile
...
CLI already provides a pager() method that feeds $PAGER on stdin, so we
just feed that the plaintext from the vault file. We can also eliminate
the redundant and now-unused shell_pager_command method in VaultEditor.
2015-09-30 22:13:36 +05:30
Brian Coca
bf06e36382
updated async to pass along no_log setting
2015-09-30 11:52:27 -04:00
Marius Gedminas
cc1e1648f5
Tweak comment style
2015-09-30 18:46:50 +03:00