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
Matt Martz
1ac7dffd55
Support using ~/.pyrax.cfg and multi environments
2014-01-28 13:58:41 -06:00
Matt Martz
139e905e98
identity_type is set dynamically above
2014-01-28 13:58:41 -06:00
Matt Martz
bc473c5be3
Support additional attributes that would allow the rax modules to work with other OpenStack clouds
2014-01-28 13:58:41 -06:00
Matt Martz
d7597414b8
Support keyring for the api_key
2014-01-28 13:58:40 -06:00
James Tanner
fe091ec00d
Merge branch 'slow_ssh' of git://github.com/lberruti/ansible into lberruti-slow_ssh
2014-01-28 13:06:07 -05:00
Adam Heath
aed2194b1d
self.su_user is done earlier in the code path, and is auto-vivified from
...
su_user_var. My last PR was only half merged, and when the bug fix for
the su/su_pass typo was merged, the removed line in this commit was
mistakenly reintroduced.
2014-01-28 11:04:24 -06:00
James Tanner
3ec043ec17
Fixes #5750 Fail on missing ~/.ssh and ignore accept_hostkey if stricthoskeychecking is off
2014-01-28 11:49:35 -05:00
James Cammarata
88e2595a90
Fixing bug relating to su without an su_pass
2014-01-27 16:27:02 -06:00
Adam Heath
fac7c6d3fe
Allow su_user to be templated, same as sudo_user.
2014-01-27 16:27:02 -06:00
James Cammarata
3fddd78ec5
Fixing traceback caused by incorrect argument passing to json.dumps
...
Fixes #5756
2014-01-27 11:28:07 -06:00
Brian Coca
59d5892fa3
added new play_hosts var
...
this variable has the 'current host list' to be executed over in the
play. Useful when using --limit to not iterate over hosts not included
in play in templates or with_items.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2014-01-25 18:43:15 -05:00
jctanner
b2d594d24e
Merge pull request #5724 from angstwad/su-tasks-fix
...
Fix bug where playbook tasks do not escalate privs with 'su'
2014-01-23 14:05:14 -08:00
jctanner
19e8742005
Merge pull request #5713 from angstwad/su-fix
...
Disallow su and sudo params in same play/task
2014-01-23 13:55:43 -08:00
Craig Tracey
8c6b3baf6f
Make default ANSIBLE_REMOTE_PORT None
...
The ansible remote port should be None, not 22. Having a default value
of 22 means that '-o Port 22' will be appended to the ssh connection
all of the time. This is incorrect as when one would like to use
something like an ssh configuration file (-F) that sets the port to
something other than 22.
Part of this change requires that we check that, in get_config, the
value is not None before trying to cast it into an integer or float.
2014-01-23 12:49:07 -05:00
Paul Durivage
e875089eba
Fix bug where self.su was being set by the sudo param in play tasks
2014-01-22 11:04:19 -06:00
Paul Durivage
01d1bd61e7
Disallow su and sudo params in same play/task
2014-01-22 10:55:45 -06:00
James Cammarata
ff8eb5f454
Merge pull request #5722 from jeromew/pipelining_default
...
Bug in constants.py, ANSIBLE_SSH_PIPELINING should be coerced to boolean
2014-01-22 07:34:02 -08:00
jeromew
ef69d23715
Bug: chmod should be called only if the tmp dir was created in the first place
2014-01-22 14:04:39 +00:00
jeromew
3f23483022
Bug in constants.py, ANSIBLE_SSH_PIPELINING should be coerced to boolean
2014-01-22 13:54:28 +00:00
James Tanner
61d283e2ad
Fix merge conflicts from #5519
2014-01-21 13:35:06 -05:00
jctanner
da136dbe7c
Merge pull request #5694 from angstwad/add-su-support-revert
...
Add su support
2014-01-21 09:57:00 -08:00
Rob Smith
761fe8cc04
Fix an issue where git-pull fails with AttributeError
...
As part of 94f3b9bfab
the code was changed to support dynamically adding localhost to the inventory. This change introduced an crash when run via ansible-pull
```
Starting ansible-pull at 2014-01-20 23:09:57
Traceback (most recent call last):
File "/tmp/ansible/bin/ansible", line 157, in <module>
(runner, results) = cli.run(options, args)
File "/tmp/ansible/bin/ansible", line 82, in run
hosts = inventory_manager.list_hosts(pattern)
File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 372, in list_hosts
result = [ h.name for h in self.get_hosts(pattern) ]
File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 136, in get_hosts
subset = self._get_hosts(self._subset)
File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 177, in _get_hosts
that = self.__get_hosts(p)
File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 198, in __get_hosts
hpat = self._hosts_in_unenumerated_pattern(name)
File "/tmp/ansible/lib/ansible/inventory/__init__.py", line 275, in _hosts_in_unenumerated_pattern
ungrouped.add_host(new_host)
AttributeError: 'NoneType' object has no attribute 'add_host'
```
The root cause is there is no group for the host to be added to. I fixed this case by creating the ungrouped group when it doesn't exist and then adding the host to the newly added group. This fixes the regression for me.
2014-01-20 20:10:47 -08:00
Rob Smith
953dc6b345
When not finding a host in ~/.ssh/known_hosts, the return value is 0 if the host just is not found. We then never check the system host file in /etc. This fixes the code to check /etc on any failure, not just a bad return code.
2014-01-20 18:56:39 -08:00
Paul Durivage
f72f5a20df
Revert "Revert "Merge pull request #5325 from angstwad/add-su-support""
...
This reverts commit c17d0e0357
.
Conflicts:
lib/ansible/runner/connection_plugins/paramiko_ssh.py
2014-01-20 19:19:03 -06:00
Paul Durivage
4c84ba74b0
Resolve su bug in paramiko libs
2014-01-20 19:16:37 -06:00
Jesse Keating
6013f0738e
Store the list of hosts to run on in runner object
...
This reduces the number of times inventory.list_hosts is called, which
can be costly. When coming from a playbook that data is already known.
2014-01-20 16:22:28 -08:00
Jesse Keating
e8ad36c8d4
Store hosts for a play as a play attribute
...
Operate on that play attribute to make things faster for larger
inventories. Instead of making a round trip through inventory.list_hosts
and working through some lengthy list comprehensions over and over
again, calculate the potenital hosts for a play once, then reduce from
it the unavailable hosts when necessary.
Also moves how the %fail is done. The host count is a play level count
of available hosts, which then is compared after each task to the
current number of available hosts for the play. This used to get a new
count every task which was also time expensive.
2014-01-20 16:22:28 -08:00
James Tanner
94f3b9bfab
Fixes #3129 Do not require localhost to be in inventory
2014-01-20 18:26:14 -05:00
James Tanner
c17d0e0357
Revert "Merge pull request #5325 from angstwad/add-su-support"
...
This reverts commit 6f4bfa2cff
, reversing
changes made to c91ba3a7c7
.
2014-01-20 16:10:11 -05:00
Paul Durivage
8cf071f697
Hostvars support for su
2014-01-20 12:01:28 -06:00
Paul Durivage
dec9131735
Ensure playbook support for su params
2014-01-20 11:46:56 -06:00
Paul Durivage
d21281ff43
Resolve rebase conflicts
2014-01-20 11:46:05 -06:00
Paul Durivage
ab6ee1a282
Enable su support in paramkio; disable su support in fireball, local, accelerate, chroot, jail, funcd connection plugins
2014-01-20 11:25:10 -06:00
Paul Durivage
4088243deb
Proposing fix for Issue #4324 ; adding support for su in connection plugins ssh, ssh_alt
...
Fixes for ssh_alt support, adding in references to in_data where appropriate
2014-01-20 11:25:10 -06:00
Michael Scherer
5c5c8fd7ce
Make synchronize module work better with local transport, fix #5668
2014-01-17 17:32:36 +01:00
Rutger Spiertz
dec6345fe6
PlayBook: better error message
...
When a PlayBook has missing arguments the error message now shows which ones are missing.
2014-01-17 10:30:57 +01:00
James Tanner
559e89036b
Fixes #5631 Return a unique list of hosts when joining groups
2014-01-16 14:24:11 -05:00
James Cammarata
02ce5af6df
Added ANSIBLE_SSH_PIPELINING option to enable/disable pipelining support
...
Pipelining will be disabled by default, since it requires users remove
the 'requiretty' option from the servers sudoers configuration.
2014-01-16 12:41:33 -06:00
James Cammarata
233aae5861
Reverting paramiko_ssh/alt changes from yesterday
2014-01-16 09:45:28 -06:00
Matt Martz
d46037d64c
Do not log the rax api_key argument in module invocation
2014-01-15 16:38:03 -06:00
James Cammarata
36e6709771
Don't use pipelining when ANSIBLE_KEEP_REMOTE_FILES is enabled
2014-01-15 16:03:18 -06:00
James Cammarata
df13b19fe1
Moving {ssh,paramiko}_alt connection types to be the defaults
...
The previous implementations will be kept for now as _old
2014-01-15 16:03:18 -06:00
James Cammarata
c27db84e41
Adding paramiko_alt - pipelining support for paramiko connections
2014-01-15 16:03:17 -06:00
jctanner
91c5c9da08
Merge pull request #5465 from deonbredenhann/false_mandatory_variable
...
Treat a False mandatory variable as defined.
2014-01-14 14:15:52 -08:00
jctanner
59d99c17b3
Merge pull request #5337 from bob-smith/bugfixFQDNParsing
...
Fix inventory parsing so that FQDN can be parsed without throwing ssh port error
2014-01-14 08:28:38 -08:00
jctanner
a6bc63512e
Merge pull request #5308 from zecrazytux/fix/hash_merge_dynamic_inventory
...
Let merge hash_bahaviour work with dynamic inventory
2014-01-14 07:58:25 -08:00
jctanner
671b0454c6
Merge pull request #4987 from jpmens/lookup-csvfile
...
New lookup plugin csvreader
2014-01-14 07:17:52 -08:00
willthames
31f5ecea60
Allow float as an argument type in AnsibleModule
2014-01-13 14:15:23 +10:00
Rob Smith
c15cffabdd
This fixes bugs added as a part of 8665b0638a
...
1. if accept_hostkey is false, no matter if the host key is known or not, it will fail.
2. We don't check for the host key in /etc/ssh/ssh_known_hosts
This fixes both of those issues.
2014-01-12 02:12:44 -08:00
James Tanner
3719f3f496
Do not fetch or add keys for http based git urls
2014-01-11 15:15:23 -05:00
James Tanner
eeee1e1c5a
Set accept_hostkey to False by default in the git module and fail
...
early if the key is unknown
2014-01-11 11:02:01 -05:00
James Tanner
8665b0638a
Add an "accept_hostkey" parameter to the git module to help automatically
...
accept hostkeys for git repos and prevent task hangs when the key is unknown
2014-01-11 10:36:45 -05:00
James Tanner
09e0d052ca
Ensure sys.stdout has an istty method
2014-01-10 17:42:43 -05:00
James Tanner
d7c8cf6ca7
Fixes #4958 Truncate printed stdout if it contains non-printable characters
2014-01-10 15:08:45 -05:00
jay
e1f5b801cf
fixed bug causing symlinks to fail in the host_vars, group_vars etc directories
2014-01-10 16:32:41 +00:00
James Tanner
78ec7c736f
Fixes #3973 Second Revision of live ansible-pull output
2014-01-10 11:18:02 -05:00
Luca Berruti
ae543eecab
Simplified p.poll handling
2014-01-10 11:34:21 +01:00
James Tanner
c408bcea31
Update sshpass hostkey error message
2014-01-08 17:25:50 -05:00
James Tanner
0b64408f5a
Fixes #5531 Give the user a better error message when sshpass does not know the remote hostkey
2014-01-08 16:50:40 -05:00
jeromew
69febcefde
remove useless create/delete remote tmp dir roundtrip in copy module
2014-01-08 15:22:12 +00:00
Serge van Ginderachter
836fb4143c
path_dwim: fix when basedir not set
2014-01-08 02:21:10 +01:00
jeromew
c9b01febb3
Make sure 'tmp' is in the remote tmp dirname to ensure correct cleanup
2014-01-07 20:56:12 +00:00
jctanner
21b4212ff5
Merge pull request #5517 from lichesser/fix_set_depreciation_warning
...
Fixes #5513 . set is built-in since 2.4 and deprecated since 2.6
2014-01-07 15:48:27 -05:00
jctanner
83dec044ab
Merge pull request #5504 from smoothify/synchronize-sudo
...
Synchronize Module: Improved sudo override behaviour.
2014-01-06 14:52:59 -08:00