Commit graph

1388 commits

Author SHA1 Message Date
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
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
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
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
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
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
d380cc7e7d Merge pull request #12543 from DevOps4Networks/devel
Guidance for pycrypto install on Mac OSX
2015-09-30 11:10:53 -04:00
Nathan Sowatskey
e7029a90e6 #12454 changing to footnote. 2015-09-30 10:45:43 +02:00
Austin Ziegler
67a980c9ef Describe the units for fact_caching_timeout 2015-09-29 11:59:55 -04:00
Nathan Sowatskey
68a927466e Updating Mac OSX guidance comment to make it a note for issue #12454. 2015-09-29 11:14:28 +02:00
Nathan Sowatskey
420589c715 Adding Mac OSX guidance comment for issue #12454. 2015-09-29 11:10:26 +02:00
Toshio Kuratomi
4225c0677d Merge pull request #12548 from amenonsen/pr-9130-rebase
#9130 rebase: EC2 Inventory Boto Profile Support
2015-09-28 10:47:12 -07:00
Jameel Al-Aziz
c08137a3d2 Update ec2 inventory documentation to refer to AWS_PROFILE 2015-09-28 21:35:46 +05:30
willthames
9c967dd054 Allow ec2 inventory to use a boto profile
This allows the EC2 inventory plugin to be used with
the same configuration against different EC2 accounts

Profile can be passed using --profile variable or using
EC2_PROFILE environment variable e.g.

```
EC2_PROFILE=prod ansible-playbook -i ec2.py playbook.yml
```

Added documentation on profiles to EC2 dynamic inventory doc

Only tries to use profiles if --profile argument is given
or EC2_PROFILE is set to maintain compatibility will boto < 2.24.

Works around a minor bug in boto where if you try and use
a security token with a profile it fails (boto/boto#2100)
2015-09-28 21:35:46 +05:30
Abhijit Menon-Sen
d4af7d256b Mention ansible_ssh_pipelining in intro_inventory 2015-09-28 20:55:14 +05:30
Nathan Sowatskey
ee6317ca07 Adding Mac OSX guidance comment for issue #12454. 2015-09-28 15:46:37 +02:00
Nathan Sowatskey
c8835b873b Adding Mac OSX guidance comment for issue #12454. 2015-09-28 15:40:32 +02:00
Nathan Sowatskey
f5c453f2b2 Adding Mac OSX guidance comment for issue #12454. 2015-09-28 15:39:35 +02:00
Brian Coca
b757798f3e Merge pull request #12483 from jeffwidman/patch-2
Clarified that .yml, .yaml, and .json are allowable file extensions for inventory vars files
2015-09-25 20:45:53 -04:00
Marius Gedminas
b57d549e16 Typo in shell command in example 2015-09-25 10:27:35 +03:00
Jeff Widman
3f135e3fac Clarified that .yml, .yaml, and .json are allowable file extensions for inventory variables files. 2015-09-22 17:56:04 -07:00
Jeff Widman
983ee0898d Add mention of roles_path parameter to ansible-galaxy install command 2015-09-22 15:03:40 -07:00
Nathaniel Schaaf
356cae9e5d Fix typo 2015-09-21 09:59:28 -05:00
Toshio Kuratomi
b11a44e5b4 Merge pull request #12097 from mgedmin/patch-1
Fix typo, remove redundant paragraph
2015-09-20 05:45:06 -07:00
James Cammarata
37f2cbc429 Merge pull request #12436 from amenonsen/ranges
Support «hosts: foo[1:]» and add tests for split/apply_subscript
2015-09-18 15:32:15 -04:00
Brian Coca
5dd61ad3fe Merge pull request #12409 from mgedmin/patch-2
Fix example formatting in the documentation
2015-09-18 14:21:58 -04:00
Abhijit Menon-Sen
2fcdb37e7b Support «hosts: groupname[1:]» notation (~= 'the rest of the group') 2015-09-18 22:28:34 +05:30
James Cammarata
951128d7a6 Merge branch 'hostpatterns' of https://github.com/amenonsen/ansible into amenonsen-hostpatterns 2015-09-17 13:31:51 -04:00
James Cammarata
ba82e57445 Merge branch 'sudo_on_if_needed' of https://github.com/apollo13/ansible into apollo13-sudo_on_if_needed 2015-09-17 11:03:27 -04:00
Abhijit Menon-Sen
b47bc343ea Document , instead of : in intro_patterns, update changelog 2015-09-17 19:34:19 +05:30
Florian Apolloner
d9f873495e Ported over #7158 to support SELinux context switches. 2015-09-17 15:03:46 +02:00
Paul Freeman
f14c617084 Documentation for retry_files_enabled and retry_files_save_path 2015-09-17 11:59:32 +01:00
Marius Gedminas
5d3d53e890 Fix example formatting 2015-09-17 11:05:37 +03:00
James Cammarata
0685262d06 Merge pull request #12397 from lambeau/devel
Fix spelling
2015-09-16 16:44:09 -04:00
Chris Church
c5409ab493 Remove ansible_winrm_ host/port/user/pass options, update exception handling around establishing a winrm connection. 2015-09-16 16:38:19 -04:00
Chris Church
056c6b77d0 Support additional options for WinRM connections via inventory variables. 2015-09-16 16:38:18 -04:00
Joshua Kugler
3004e9bec8 Fixing a small typo
Just adding a missing letter.
2015-09-16 11:00:19 -08:00
Nathaniel Schaaf
ffc67f0a37 Fix spelling 2015-09-16 10:48:23 -05:00
James Cammarata
719e4020e0 Merge pull request #12387 from jkugler/patch-1
Small change so the YAML renders as code.
2015-09-16 10:38:23 -04:00
Joshua Kugler
d31f61e35c Wrong column named
Correcting the docs to match the example, which I assume to be correct.
2015-09-15 15:49:38 -08:00
Joshua Kugler
1dc7cce910 Small change so the YAML renders as code.
The line above the last YAML code block in this document did not have the requisite :: characters, so the YAML did not render correctly in the docs.
2015-09-15 15:37:20 -08:00
Brian Coca
0aeaacb947 fixed zpellings 2015-09-15 12:06:40 -04:00
Brian Coca
b6d6c2e4db corrected all missing paths changes 2015-09-15 11:57:54 -04:00
Brian Coca
4241df41aa fixed typoe (thanks @resmo) 2015-09-15 11:45:55 -04:00
Brian Coca
7f52d909c4 rewrote 1.x section of precedence to prevent promissing specificity to those reading docs for earlier versions 2015-09-15 11:40:53 -04:00
Brian Coca
6e34e84417 documenting var precedence
made new sections for vars, started explaining scope, gave example on command line override of connection vars
added some formatting changes and clarifications
2015-09-15 11:40:53 -04:00
Brian Coca
7c669f5a33 Merge pull request #12375 from jhawkesworth/configuring_kerberos_doc
Documentation PR. Add kerberos configuration instructions to windows intro page
2015-09-15 10:23:53 -04:00
Tim Gerla
e5a981e713 typo fix 2015-09-15 10:00:01 -04:00
Brian Coca
5c7bca9e17 Merge pull request #12369 from bborysenko/docsite/playbooks_variables
docs - minor fixes to playbooks_variables
2015-09-15 09:53:23 -04:00
Brian Coca
43ea5f0853 added note about registered variables 2015-09-15 09:49:22 -04:00