James Cammarata
3f90020d62
Open LOG_LOCK file with FD_CLOEXEC to prevent file descriptor leakage
...
Fixes #5399
2014-02-10 15:51:52 -06:00
James Cammarata
bbda98a3ee
Merge branch 'issue_4812' into devel
2014-02-10 13:35:53 -06:00
James Cammarata
bb79b16d59
Specify mode in the makedirs call for fireball/accelerate keys
2014-02-10 13:27:43 -06:00
James Cammarata
65cb79a5c1
Merge branch 'devel' of https://github.com/xyrix/ansible into xyrix-devel
2014-02-10 13:18:59 -06:00
Richard C Isaacson
786e3d2fd2
Refining the fix made in #5885 .
...
It turns out that some of the assumptions in #5885 were slightly off. The previous fix relied on a call to the module to creat a tmp_path. This is insufficent as there are few cases that we need to have the tmp directory before we make the module call. If we don't have a tmp_path before we do a recursive call or when we find a file that does not match the remote md5 hash we need to create a tmp directory. Also we are not more percise when we will need to clean up the remote tmp_path.
2014-02-08 02:25:42 -06:00
Michael DeHaan
1609dfbca4
Revert "Revert "Revert "Add the fork manager code (related to previous patch)."""
...
This reverts commit 60d3611b70
.
2014-02-07 20:38:24 -05:00
Michael DeHaan
633d685bb7
Revert "Revert "Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks"""
...
This reverts commit 73ca1a173c
.
2014-02-07 20:38:20 -05:00
Michael DeHaan
ad8c275887
Revert "While the previous work on the foon class can't be quite recycled, it's still a nice abstraction."
...
This reverts commit caab52aee2
.
2014-02-07 20:38:18 -05:00
Michael DeHaan
caab52aee2
While the previous work on the foon class can't be quite recycled, it's still a nice abstraction.
2014-02-07 19:32:19 -05:00
Michael DeHaan
73ca1a173c
Revert "Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks""
...
This reverts commit 6685b4989e
.
2014-02-07 18:14:27 -05:00
Michael DeHaan
60d3611b70
Revert "Revert "Add the fork manager code (related to previous patch).""
...
This reverts commit c53538dc77
.
2014-02-07 18:14:13 -05:00
Michael DeHaan
6685b4989e
Revert "This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks"
...
This reverts commit 85d66b9a0c
.
2014-02-07 18:10:38 -05:00
Michael DeHaan
c53538dc77
Revert "Add the fork manager code (related to previous patch)."
...
This reverts commit adb1719fe8
.
2014-02-07 18:10:29 -05:00
Michael DeHaan
adb1719fe8
Add the fork manager code (related to previous patch).
2014-02-07 16:53:35 -05:00
Michael DeHaan
85d66b9a0c
This patch makes Ansible reuse fork allocation between seperate instantations of the runner API, therefore the overhead of recreating forks
...
between tasks in a playbook is avoided. The fork pool will be regenerated when a second play comes along and needs more hosts.
2014-02-07 16:53:35 -05:00
Richard Isaacson
2d88246c9d
Merge pull request #5885 from risaacson/issue5739_4
...
Addresses #5739 and cleans up copy.py
2014-02-07 13:49:06 -06:00
James Tanner
b3ab7e7885
Check mutually_exclusive parameters before applying defaults
2014-02-07 13:42:08 -05:00
jctanner
0bc0315171
Merge pull request #5880 from willthames/ec2_modules_refactor
...
Create a common EC2 connection argument spec for EC2 modules
2014-02-06 11:08:09 -05:00
xyrix
20d97416e5
fixed thinkoes
2014-02-06 13:02:11 +00:00
xyrix
0af40374ed
fixed file perms checking
2014-02-06 12:48:34 +00:00
xyrix
1de45bf687
made accelerate keys directory configurable, and permissions for the file and dir configurable, and gave them a safe default
2014-02-06 08:53:43 +00:00
James Cammarata
a72dc2ec34
Use finalize method in jinja2 to convert None values to empty strings
...
Fixes #4812
2014-02-06 00:43:31 -06:00
Will Thames
7600c664fe
Create a common EC2 connection argument spec for EC2 modules
...
Refactor the currently well-factored ec2 modules (i.e. those that already use ec2_connect) to
have a common argument spec. The idea is that new modules can use this spec without duplication
of code, and that new functionality can be added to the ec2 connection code (e.g. security
token argument)
2014-02-06 15:27:41 +10:00
jctanner
28933de84d
Merge pull request #5771 from bcoca/play_hosts2
...
added new play_hosts var
2014-02-05 23:52:20 -05:00
James Cammarata
959a156195
Properly count newlines appearing at the end of templates after rendering
...
Fixes #4633
2014-02-05 15:14:19 -06:00
Richard C Isaacson
ac0a5c8ad5
Dug into the remaining FIXME and replaced with comments to document the expected behavior.
2014-02-05 11:39:22 -06:00
Luca Berruti
75b7a1d9c7
Fix slow ssh
...
We break the read while loop after waiting "the end of the process" and
the pipes are empty, otherwise we do another select that waits all the
timeout.
2014-02-05 09:45:03 +01:00
jctanner
a0f91f2aaa
Merge pull request #5576 from xyrix/symlink-bug-fix
...
fixed bug causing symlinks to fail in the host_vars, group_vars etc dire...
2014-02-04 11:39:54 -08:00
jctanner
253fe7be50
Merge pull request #5662 from RSpiertz/update_playbook_error
...
PlayBook: better error message
2014-02-04 11:16:44 -08:00
Richard C Isaacson
a3261500dd
Addresses #5739 and cleans up copy.py
...
The copy action_plugin is not easy to read. Part of this commit is taking that file, restructuring it, and adding comments. No functionality changed in how it interacts with the world.
The fix for #5739 ends up being the assumption that there is a cleanup 'rm -rf' that happens at the end of the copy loop. This was not the fact before and we made a bunch of tmp directories that we hoped would end up being cleaned up. Now we just use the tmp directory that the runner provides and cleanup inline if it is a single file to be coppied or after the loop if it is a recursive copy.
As a part of this we did end up having to change runner to provide a flag so that we could short the inline tmp directory removal. This flag defaults to True so it will not change the behavior of other modules that are being called.
2014-02-04 12:44:10 -06:00
James Tanner
5fafc61008
Fixes 5870 Template delegate hostname earlier in the process
2014-02-04 13:31:22 -05:00
James Tanner
d355d3c698
Fixes #5818 Default to all known connection information for the delegate host
2014-02-03 16:59:30 -05:00
Timur Batyrshin
658c15930e
reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 ( #5852 )
2014-02-03 13:00:40 -06:00
James Cammarata
2d0e9cd75d
Revert "Fix for issue 5739. The copy module does not delete directories it will only unlinks symlinks."
...
This reverts commit b20dc4f578
.
2014-02-03 12:54:52 -06:00
James Cammarata
ae9843fccd
Fix issue with handler notifications being sent out incorrectly
...
This is a partial revert of e8ad36c
, which introduced the bug.
Fixes #5848
2014-02-03 10:10:45 -06:00
James Cammarata
9ff99acaff
Merge branch 'issue5739_3' of https://github.com/risaacson/ansible into risaacson-issue5739_3
2014-02-03 09:52:50 -06:00
Brian Coca
ff024b65b2
now with_items also accepts sets
...
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2014-02-01 17:55:38 -05:00
Richard C Isaacson
b20dc4f578
Fix for issue 5739. The copy module does not delete directories it will only unlinks symlinks.
2014-01-31 17:19:44 -06:00
James Cammarata
75e3b59bbd
Adding no_log: capability for tasks
...
Fixes #4088
2014-01-31 16:58:46 -06:00
James Tanner
e6aeb191d5
Revert "Merge branch 'slow_ssh' of git://github.com/lberruti/ansible into lberruti-slow_ssh"
...
This reverts commit fe091ec00d
, reversing
changes made to aed2194b1d
.
2014-01-30 16:02:05 -05:00
James Cammarata
9574f89471
Detect remote_user change in accelerate daemon and allow a restart
...
Fixes #5812
2014-01-30 14:40:41 -06:00
jctanner
6c25ea1b91
Merge pull request #5527 from sergevanginderachter/basedirdwim
...
path_dwim: fix when basedir not set
2014-01-30 10:54:19 -08:00
James Cammarata
f955d9db6a
Handle implicit localhost when using '-i host,' syntax
...
Fixes #5820
2014-01-30 12:46:02 -06:00
jctanner
360f06b41d
Merge pull request #5806 from sivel/rax-mod-utils-improvements
...
Rax mod utils improvements
2014-01-29 16:17:06 -08:00
James Cammarata
5cc354696d
Build variable dictionary on included plays without using dict()
...
Using dict(k=v) means the key was always named 'k', as the variable
is not interpreted there.
Fixes #5801
2014-01-29 12:31:12 -06:00
Michael DeHaan
d07a3b5e9b
AnsibleWorks -> Ansible
2014-01-28 20:29:42 -05:00
Heikki Hokkanen
b6875b3b87
Fix .ssh/known_hosts path expansion.
...
In particular, do not rely on the $USER environment variable always existing.
tmux for example seems to clear it, causing lots of invalid messages:
"previous known host file not found"
This broke in commit 80fd22dc
, but instead of reverting that commit, we now
fall back to expanding just ~ when $USER is not set.
2014-01-28 15:11:44 -06:00
Matt Martz
ac666e63e0
Support providing a tenant_name also
2014-01-28 13:58:41 -06:00
Matt Martz
aa709012ba
Make sure to also include the region when using keyring_auth
2014-01-28 13:58:41 -06:00
Matt Martz
021b926235
Only specify to USE_KEYRING as the api_key/password when we actually got a keyring_username from ~/.pyrax.cfg
2014-01-28 13:58:41 -06:00