Commit graph

2744 commits

Author SHA1 Message Date
jctanner
83b00e60e3 Merge pull request #4776 from jlaska/ec2_wait_on_terminate
Honor wait on ec2 instance termination
2013-11-06 12:02:00 -08:00
jctanner
544b271c6a Merge pull request #4760 from urbanmapping/devel
make cloudformation module accept template_parameters from command line
2013-11-06 08:12:11 -08:00
jctanner
d0581d1c4d Merge pull request #4786 from SalesSeek/find-correct-easy-install
Fix determination of correct, possibly customized, 'easy_install' executable
2013-11-06 07:39:19 -08:00
jctanner
904a829c8c Merge pull request #4811 from dragon3/duplicate_download_s3file
Remove duplicate "download_s3file" execution when the destination path doesn't exist
2013-11-05 16:00:33 -08:00
James Tanner
104eaaa8e1 Addresses #4735 Verify the virtualenv command supports --no-site-packages before passing it 2013-11-05 18:51:41 -05:00
jctanner
c7cf4578b8 Merge pull request #4735 from chrisalbright/patch-1
pip module: fix unexpected behavior when creating virtualenvs
2013-11-05 15:50:08 -08:00
jctanner
6bbb4d20ef Merge pull request #4797 from weaselkeeper/devel
fix for https://github.com/ansible/ansible/issues/4795 (incorrect changed result in cron module)
2013-11-05 12:25:54 -08:00
dragon3
15b6dad3e3 Remove duplicate "download_s3file" execution when the destination path doesn't exist 2013-11-05 22:03:40 +09:00
willthames
91b827768d Ensure async terminates when time limit is not divisible by 5
Because async_wrapper subtracts 5 from time_limit and checks for
equality to zero, values not divisible by 5 will go negative and
continue forever.
2013-11-05 09:42:28 +10:00
jctanner
ac3baf2f93 Merge pull request #4772 from mscherer/fix_4763
Try/finally is a python 2.5 construct, so not working on EL5. Fix #4763
2013-11-04 15:36:02 -08:00
James Tanner
78f4f95e64 Fixes #4485 add an ipv6 parameter to accelerate so that the daemon will bind to an ipv6 port instead of ipv4 2013-11-04 17:20:03 -05:00
Jim Richardson
71bf839121 return True/False from remove_job_file()
revised fix for https://github.com/ansible/ansible/issues/4795
2013-11-04 14:14:53 -08:00
James Tanner
7b3fbeee16 Addresses #4676 Add module notes about the behavior of sudo and the destination paths within the synchronize module. 2013-11-04 12:19:31 -05:00
James Tanner
403469bf19 Update synchronize docstrings for rsync_timeout parameter 2013-11-04 10:57:08 -05:00
James Tanner
ae1248dee6 Add a timeout to the synchronize module to prevent infinite hangs while waiting on passwords for misconfigured users 2013-11-04 10:52:44 -05:00
Jim Richardson
dd313b1b8f fix for https://github.com/ansible/ansible/issues/4795
Incorrect changed result in cron module.
Report changed=False if no cron is removed:wq
2013-11-03 17:43:51 -08:00
Michael DeHaan
1381f80e47 Make it slightly more clear what side of the connection is missing keyczar if using accelerate mode. 2013-11-03 12:46:21 -05:00
Michael DeHaan
3e930cfcfd Merge pull request #4789 from mohangk/devel
Fix for connect method parameter order
2013-11-03 08:49:00 -08:00
Mohan Krishnan
2232b9ce6a Fix for connect method parameter order 2013-11-03 14:48:35 +07:00
Steve Tjoa
de4b105e09 Changed parameter from 'user' to 'name' in the examples to coincide with the specs. 2013-11-02 22:42:44 -07:00
Mohan Krishnan
6ab967ef9f ec2_eip connect method references module var that is not passed in 2013-11-03 05:18:27 +07:00
Pedro Romano
22c7891886 Obsolete attempts at determining the full path to the desired
'easy_install' executable were still left behind and need to be removed
for the customizable 'executable' task argument to correctly work:
'_get_easy_install' should take care of all the functionality related to
determining the correct 'easy_install' executable to use.
2013-11-02 19:25:51 +00:00
Michael DeHaan
e939a41bfb Update module documentation. 2013-11-02 09:34:44 -04:00
Michael Scherer
8f5a0f9112 Try/finally is a python 2.5 construct, so not working
on EL5. Fix #4763
2013-11-02 11:24:29 +01:00
James Laska
582a32040b Honor wait on ec2 instance termination 2013-11-01 18:57:20 -04:00
Michael DeHaan
2dd59c87a4 Merge pull request #4770 from dragon3/devel
ec2_vol: return volume_id/device even when volume mapping already exists
2013-11-01 09:32:54 -07:00
James Tanner
0a5adda059 Fixes #4540 Use shared module snippet to evaluate ec2 credentials 2013-11-01 11:59:24 -04:00
dragon3
2d857c9c44 return volume_id/device even when volume mapping already exists 2013-11-01 23:59:42 +09:00
James Tanner
c3159fefab Fixes #4516 file module: check prev_state earlier and use that if state is not specified 2013-11-01 09:31:32 -04:00
Michael DeHaan
8687525d18 Fix documentation formatting. 2013-10-31 20:00:11 -04:00
Brian Cavagnolo
c42d987788 make cloudformation module accept template_parameters from command line
Passing cloudformation template_parameters on the command line
like so was failing:

    ansible localhost -m cloudformation -a "...template_parameters=foo=5,bar=4..."
2013-10-31 17:00:03 -07:00
Michael DeHaan
dd6af369af Some simplification of include_vars and renamed include_files to include_vars. 2013-10-31 19:24:35 -04:00
Michael DeHaan
684cbf8154 Merge branch 'include_files' of git://github.com/bennojoy/ansible into devel 2013-10-31 19:14:27 -04:00
Michael DeHaan
b5e5a96d03 Leverage 4318b27 and no longer treat instance tags as JSON, but as dictionary types which could be key=value or dicts or JSON or references. 2013-10-31 18:46:13 -04:00
Michael DeHaan
3112f1b84c Merge pull request #4756 from mscherer/fix_4739
Fix accelerate module on centos 5 by removing
2013-10-31 15:21:51 -07:00
Michael DeHaan
50ef750a25 Suggest keyscan for github/other SCM hanging. 2013-10-31 18:00:24 -04:00
Michael DeHaan
422bba7b4c Merge pull request #4740 from retr0h/return-server-object-not-list
Need to compare on server object not list
2013-10-31 14:51:08 -07:00
Michael DeHaan
9acff0fae0 Merge pull request #4736 from dmkoch/assemble-temp-file-cleanup
Clean up temp file left behind by assemble module
2013-10-31 14:50:28 -07:00
Michael DeHaan
99a8213be1 Merge pull request #4754 from mscherer/fix_4648
Fix 4648, cron module is not working on solaris
2013-10-31 14:49:25 -07:00
Michael DeHaan
0e7069d7c1 Undo an inadvertant revert from template changes so we still allow pythonic imports in module land. 2013-10-31 16:53:05 -04:00
Michael Scherer
a53972c3a7 Fix accelerate module on centos 5 by removing
unsupported string prefix in 2.4

http://docs.python.org/release/2.4/ref/strings.html
This is also ignored on later version of python 2
and is present only for python 3 conversion, as seen
on http://docs.python.org/2/reference/lexical_analysis.html#string-literals

Also see http://stackoverflow.com/questions/6269765/what-does-the-b-character-do-in-front-of-a-string-literal

Fix https://github.com/ansible/ansible/issues/4739
2013-10-31 21:04:34 +01:00
Michael Scherer
2a3ee8dbf4 make cron module work on solaris
Cron on solaris do not take the same
set of option than vixie cron on linux, and
among the biggest difference, root cannot set
the crontab of a user directly from a file. Thus the
use of su to run the crontab command. Fix issue #4648
2013-10-31 19:58:26 +01:00
Michael Scherer
5547cc9c29 remove unused function 2013-10-31 19:58:26 +01:00
Scott Dunlop
be6e2c9097 add "zle" as a supported ZFS compression type
ZFS supports "zle" compression, which compresses runs of null bytes efficiently.
2013-10-31 10:48:41 -07:00
Sheldon Hearn
5e7be2041e Fix description of nova_compute:name option
It's the name of the instance, not of an image.
2013-10-31 12:34:04 +02:00
John Dewey
fdec31f200 Need to compare on server object not list
TASK: [create test controller 0] **********************************************
    failed: [127.0.0.1] => {"failed": true, "parsed": false}
    invalid output was: Traceback (most recent call last):
      File "/Users/jdewey/.ansible/tmp/ansible-1383197329.62-262790004573235/nova_compute", line 1203, in <module>
        main()
      File "/Users/jdewey/.ansible/tmp/ansible-1383197329.62-262790004573235/nova_compute", line 261, in main
        _get_server_state(module, nova)
      File "/Users/jdewey/.ansible/tmp/ansible-1383197329.62-262790004573235/nova_compute", line 197, in _get_server_state
        if server.status != 'ACTIVE':
    AttributeError: 'list' object has no attribute 'status'
2013-10-30 22:41:02 -07:00
chrisalbright
dbbad79299 pip module: fix unexpected behavior when creating virtualenvs
This module supports `virtualenv_site_packages` as an option to control whether or not to include system packages when installing pip packages into a virtual environment. 

The default is no, and when you say yes it explicitly it includes a flag to include site packages, otherwise it doesn't provide a flag. 

Some versions of virtualenv by default include site packages and other versions by default do not. 

This patch just makes both branches explicit, so `virtualenv_site_packages=no` really means no.
2013-10-30 17:27:02 -07:00
Daniel Koch
fc8b88995a Clean up temp file left behind by assemble module 2013-10-30 20:24:03 -04:00
Michael DeHaan
98b23de9ab Merge pull request #4727 from leth/apt-key-leading-zeros
Only remove leading '0x' from apt key ids, not all 0s
2013-10-30 17:16:20 -07:00
James Tanner
8036e6ee23 Revert templating enhancements from 73dbab70 e6c28658 d409352c 9858b1f2 4587528b 9b1fe455 214b0b05 8d3db803 7f9504d1 5031104c 35cb9dc2 2bd8cb57 1e85c754 2013-10-30 10:50:16 -04:00