Toshio Kuratomi
1d119a1f46
Cleanup some extraneous imports
2015-09-28 22:35:52 -07:00
James Cammarata
ffdba96668
Save the included directory for playbook includes for use as the basedir
...
Fixes #12524
2015-09-29 00:28:45 -04:00
Konstantin Manna
4226e49bc6
bugfix: statement had no effect => statement now has assumed effect
2015-09-28 23:33:48 -04:00
Konstantin Manna
1ccfeafa76
bugfix: use correct close calls
2015-09-28 23:33:32 -04:00
Brian Coca
c1ad96e5cf
removed fixme as it is already implemented below.
2015-09-28 23:32:57 -04:00
Toshio Kuratomi
12a2585e84
chroot plugin minor touchups:
...
* Disable su as it's not currently working 100% (and was disabled in v1).
* Move BUFSIZE out of the class to match other conenction plugins
* _connect shouldn't return self.
2015-09-28 13:16:56 -07:00
Toshio Kuratomi
7a4266e9c5
One more try -- the error message should reference the become method
...
requested via play context
2015-09-28 11:28:33 -07:00
Toshio Kuratomi
696cf32d63
Correct name of variable
2015-09-28 11:28:33 -07:00
Brian Coca
8d024c3747
Merge pull request #12472 from resmo/for_ansible
...
cloudstack: improvements and tests
2015-09-28 14:27:22 -04:00
Toshio Kuratomi
0dfa1fb43a
Correct call to method typo
2015-09-28 11:24:00 -07: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
Toshio Kuratomi
d827325644
Re-order the methods in ssh.py so that methods needed for implementation are near and just above the relevant public methods.
...
Standard with the rest of the code base.
2015-09-28 10:34:02 -07:00
Toshio Kuratomi
37844a5c1b
Update submodule refs
2015-09-28 09:47:16 -07:00
Toshio Kuratomi
c811668a4d
Merge pull request #12546 from amenonsen/ssh-cleanups
...
A couple of ssh cleanups
2015-09-28 09:46:24 -07:00
Will Thames
b0133d9c8f
Move connection handling failure to connect_to_aws
...
Make use of better error handling mechanism
2015-09-28 21:35:46 +05:30
Jameel Al-Aziz
c08137a3d2
Update ec2 inventory documentation to refer to AWS_PROFILE
2015-09-28 21:35:46 +05:30
Jameel Al-Aziz
57754b5a71
Fix security_token typo in ec2 inventory
2015-09-28 21:35:46 +05:30
Jameel Al-Aziz
e7890e66f3
Combine ansible/ansible#5987 and ansible/ansible#8582
...
Fixes merge conflicts and standardizes option naming
2015-09-28 21:35:46 +05:30
Jeff '2 bits' Bachtel
8c11ea5666
Add an ec2 inventory option "boto_profile" that allows
...
the use of boto profiles for separating credentials as
specified in
http://boto.readthedocs.org/en/latest/boto_config_tut.html
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
Toshio Kuratomi
05af4c8e91
Merge pull request #12471 from amenonsen/pipelining
...
Make pipelining a connection variable
2015-09-28 09:02:43 -07:00
Abhijit Menon-Sen
38c7422da5
Move ControlPersist/Path checking into a separate method
...
This is also peripheral to what _build_command needs, can be improved
and tested independently, and so makes more sense in a separate method.
This commit doesn't change any functionality (and I've verified that it
works with the various combinations: control_path set in ansible.cfg,
ssh_args adding or not adding ControlMaster/ControlPersist, etc.).
2015-09-28 21:11:56 +05:30
Toshio Kuratomi
c3a05b1181
Update to fix one more doc error
2015-09-28 08:38:24 -07:00
Abhijit Menon-Sen
f33d541964
Move sshpass checking into a separate method
...
Checking for sshpass is peripheral to the calling code, so it's easier
to follow when the details are moved into a method.
2015-09-28 20:58:30 +05:30
Abhijit Menon-Sen
d4af7d256b
Mention ansible_ssh_pipelining in intro_inventory
2015-09-28 20:55:14 +05:30
Abhijit Menon-Sen
565c6f1ae7
Make ansible_pipelining a connection variable
...
SSH pipelining can be a significant performance improvement, but it will
not work if sudoers is configured to requiretty. With this change, one
could have pipelining enabled in ansible.cfg, but use sudo to turn off
requiretty in a separate play (or task) where pipelining is disabled:
- hosts: foo
vars:
ansible_pipelining: no
tasks:
- lineinfile: dest=/etc/sudoers line='Defaults requiretty' state=absent
sudo_user: root
(Note that sudoers has a complicated syntax, so the above lineinfile
invocation may be too simplistic for production use; but the point is
that a separate play can do something to disable requiretty.)
2015-09-28 20:55:14 +05:30
Toshio Kuratomi
fd267989fb
Fix docs build
2015-09-28 08:23:12 -07:00
Toshio Kuratomi
69ebb899a7
Update submodule refs
2015-09-28 07:52:04 -07:00
James Cammarata
c860775b5d
Another fix for --limit in adhoc
2015-09-28 10:39:33 -04:00
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
James Cammarata
babf47decb
Clean up some bugs related to --limit on adhoc commands
2015-09-28 09:02:24 -04:00
James Cammarata
621575681a
Merge pull request #12542 from amenonsen/qfix
...
Clarify why we add -q only for ssh
2015-09-28 08:18:31 -04:00
James Cammarata
ed73b45ec7
Merge pull request #12540 from mgedmin/py3k
...
Python 3: the StringIO module is gone
2015-09-28 08:18:07 -04:00
Abhijit Menon-Sen
2ce219b5af
Clarify why we add -q only for ssh
2015-09-28 16:00:23 +05:30
Marius Gedminas
9b39af8e9a
Python 3: the StringIO module is gone
...
Fixes 17 failing tests on Python 3.4, restoring the 8 failures we had
last Friday.
2015-09-28 09:28:53 +03:00
James Cammarata
4cd810a674
Only append -q option for ssh if we're using ssh
2015-09-26 21:27:38 -04:00
James Cammarata
46984a067c
Don't wrap vars from include_vars with UnsafeProxy
2015-09-26 15:16:46 -04:00
James Cammarata
4c7843f268
Merge pull request #12532 from fboender/devel
...
Output proper JSON from vbox dynamic inventory contrib script
2015-09-26 14:20:45 -04:00
James Cammarata
abfeb104df
Merge pull request #12529 from soarpenguin/bug-fix
...
fix no self pointer out of class.
2015-09-26 14:18:58 -04:00
Toshio Kuratomi
342bc97322
Port chroot conection plugin to the latest v2 connection API.
...
Also get pipelining working for people who look to chroot as an example
for their own connection plugins
Note: In the latest v2 API, action handles become but chroot doesn't
reliably handle become. Maybe we need to add a has_become attribute
that the action can display an appropriate error.
2015-09-26 10:00:28 -07:00
Toshio Kuratomi
056a020357
Do not fail if /proc/uptime is not present
...
This can happen in chroot environments that don't have all of /proc
available
2015-09-26 10:00:28 -07:00
Toshio Kuratomi
ae66d01a33
Document how a command is executed on the remote machine
...
Helps connection plugin implementors understand how to structure
exec_command()
2015-09-26 10:00:28 -07:00
Ferry Boender
c6c3ce6616
Output proper JSON from vbox dynamic inventory contrib script
2015-09-26 18:25:58 +02:00
James Cammarata
6dd38c2a10
Fix parent attribute lookup to be default
...
Fixes #12526
2015-09-26 11:28:29 -04:00
James Cammarata
a1c38a3fda
Adding delegate_to to Blocks
2015-09-26 11:28:01 -04:00
Brian Coca
bb6141ec41
renamed managed_syslog to no_target_syslog
2015-09-26 08:22:32 -04:00
Brian Coca
a591582b24
Merge pull request #12530 from amenonsen/fixups
...
Update outdated comment
2015-09-26 08:16:14 -04:00
Abhijit Menon-Sen
8251ab2e37
Update outdated comment
...
Since #12165 was merged, hostnames are properly validated.
2015-09-26 17:32:13 +05:30