Commit graph

7517 commits

Author SHA1 Message Date
Michael Scherer
1ef9bed752 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
2a5874b94f Honor wait on ec2 instance termination 2013-11-01 18:57:20 -04:00
Michael DeHaan
99687749a3 Merge pull request #4775 from steverweber/fix-4640
dont sudo if sudo_user is the same as the connection user
2013-11-01 15:27:55 -07:00
Michael DeHaan
874c0d1c00 Merge pull request #4774 from rsutphin/source_env_in_mod_dev_docs
Document env dependency for test-module
2013-11-01 15:27:36 -07:00
Steve Weber
5bd52796ec dont sudo if sudo_user is the same as the active user 2013-11-01 14:19:33 -04:00
Yegor Minin
df5fd0e0d0 apt: allow specifying dpkg options
This will allow specifying dpkg options as a string passed over to apt
command. dpkg_options expects a comma-separated string of options to be
passed as dpkg options which will be further expanded. For example
dpkg_options='force-confdef,force-confold' will end up as
-o \"Dpkg::Options::=--force-confold\" when passed to apt
Example usage would be:
-m apt -u ubuntu -s \
 -a "upgrade=dist update_cache=yes dpkg_options='force-confold'"
or
apt: upgrade=dist update_cache=yes dpkg_options='force-confold'
2013-11-01 20:11:40 +02:00
Rhett Sutphin
aa475d337a Document env dependency for test-module.
You need to source hacking/env-setup before running hacking/test-module;
otherwise you get an error like this:

    ImportError: No module named ansible.utils
2013-11-01 12:32:15 -05:00
Michael DeHaan
e725eea4be 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
afa5988391 Fixes #4540 Use shared module snippet to evaluate ec2 credentials 2013-11-01 11:59:24 -04:00
dragon3
19b5008c0a return volume_id/device even when volume mapping already exists 2013-11-01 23:59:42 +09:00
Alan Fairless
0824f004d9 Revised patch for more password entropy 2013-11-01 09:51:35 -05:00
Hiroaki Nakamura
abed2c47fa Fix for RHEL6. 2013-11-01 23:32:14 +09:00
James Tanner
dc4d589ce0 Fixes #4767 detect hard links and set state in add_file_info 2013-11-01 09:41:22 -04:00
James Tanner
f4b59fe285 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 Vogt
b8e641136a make comment lines in troff start with .\" and add a .SH EXAMPLES to the PLAINEXAMPLES section 2013-11-01 09:20:05 +01:00
Michael DeHaan
d478eaa6a5 Merge pull request #4761 from truedays/devel
minor correction
2013-10-31 17:41:20 -07:00
Ray
b5266a562d minor correction
Same doc-typo (confirmed) as https://github.com/ansible/ansible/pull/4759

--remote-user  *should be*  --user
2013-10-31 19:29:46 -05:00
Michael DeHaan
337b6ce642 Fix documentation formatting. 2013-10-31 20:00:11 -04:00
Brian Cavagnolo
869f32123b 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
b1b5280075 Reapply pep8 changes from previous revert. 2013-10-31 19:47:44 -04:00
Michael DeHaan
01ba1e9297 Merge pull request #4759 from truedays/devel
minor doc correction
2013-10-31 16:40:15 -07:00
Michael DeHaan
51fbc6d20a Further simplify the debug: var=foo action plugin code. 2013-10-31 19:39:32 -04:00
Michael DeHaan
bbf212a268 Simplify the way the debug: var=varname plugin works. 2013-10-31 19:35:50 -04:00
Michael DeHaan
a078184ae8 add to changelog 2013-10-31 19:25:16 -04:00
Michael DeHaan
7f125567cb Some simplification of include_vars and renamed include_files to include_vars. 2013-10-31 19:24:35 -04:00
Michael DeHaan
b69ab89eb1 Merge branch 'include_files' of git://github.com/bennojoy/ansible into devel 2013-10-31 19:14:27 -04:00
Ray
a66f0462cd minor correction
--remote-user= does not work:
 ansible: error: no such option: --remote-user

--user= does. Updating docs
2013-10-31 17:56:52 -05:00
Michael DeHaan
187ebf2f56 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
465f3b1c91 This allows type=dict in a module to allow passing in a real dict or JSON. 2013-10-31 18:46:13 -04:00
Michael DeHaan
b520902852 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
6d16f85b30 Suggest keyscan for github/other SCM hanging. 2013-10-31 18:00:24 -04:00
Michael DeHaan
aae3a0ea8d 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
3a0d67024c 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
3705f41992 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
8b2cd6413b When inside an apt or yum task account for multiple conditionals. Fixes 4745. 2013-10-31 17:19:58 -04:00
Michael DeHaan
d34a26e307 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
8efe53eebb 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
9e7b02aaee 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
506ce6a809 remove unused function 2013-10-31 19:58:26 +01:00
jctanner
affa703fcb Merge pull request #4749 from swdunlop/patch-1
add "zle" as a supported ZFS compression type
2013-10-31 11:22:11 -07:00
Michael DeHaan
4489de53d1 Merge pull request #4748 from alanfairless/fix-module-format-string-typo
Fix format string typo
2013-10-31 11:07:36 -07:00
Scott Dunlop
dbc1e20462 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
Alan Fairless
af40b19a2d Fix format string typo 2013-10-31 12:34:51 -05:00
Michael DeHaan
a7121d00ac Merge pull request #4326 from angstwad/devel
Revamp of the rax.py inventory plugin
2013-10-31 10:08:52 -07:00
Michael DeHaan
4a3e828b83 Merge pull request #4742 from sheldonh/devel
Fix description of nova_compute:name option
2013-10-31 05:05:05 -07:00
Sheldon Hearn
6a02c75b7c 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
f1fa16b65f 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
Michael DeHaan
7b331ef6ed Fix code typo. I'll blame jet lag for now :) 2013-10-30 21:28:47 -04:00
Michael DeHaan
90cce35919 This allows variable references in playbooks in a different way. 2013-10-30 21:26:16 -04:00
Michael DeHaan
b5c9d5a59b Inventory directory should always be absolute. Fixes #4535. 2013-10-30 20:48:53 -04:00