Commit graph

10599 commits

Author SHA1 Message Date
Michael DeHaan
54ac0fe92c Merge pull request #7343 from lberruti/alternatives_python5_2
Make alternatives module python 2.5 compatible
2014-05-09 09:08:34 -04:00
James Laska
4ee0898fc9 Assert the MOCK_CFG exists for the mock-rpm build target 2014-05-09 09:01:44 -04:00
Herby Gillot
efbe4ca8d5 rds module: Fix undeclared reference to "params" when setting password in
modify mode.
2014-05-09 05:49:11 -04:00
James Cammarata
5c7109b8b9 Merge pull request #7110 from orgoj/docker-patch-version_comment
module docker - add docker version comment
2014-05-09 00:57:41 -05:00
James Cammarata
c5dea0f062 Merge branch 'jjshoe-devel' into devel 2014-05-09 00:32:41 -05:00
James Cammarata
a18f4b6230 Merge branch 'devel' of https://github.com/jjshoe/ansible into jjshoe-devel 2014-05-09 00:31:39 -05:00
James Cammarata
9b9b4d50fe Merge pull request #7058 from jkleckner/fix-vars_prompt-when-default-False
Fix #7057 missing False default for vars_prompt
2014-05-09 00:29:31 -05:00
James Cammarata
0215134907 Fixing a doc mistake in the ec2 module from 4269bb6 2014-05-09 00:21:35 -05:00
James Cammarata
8b96a9cf72 Merge branch 'sayap-ec2-start-stop' into devel 2014-05-09 00:17:00 -05:00
James Cammarata
48e2a5e5a2 Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop 2014-05-09 00:04:34 -05:00
Yap Sok Ann
4269bb6a45 ec2: Fix bug with running/stopped state and wait=yes.
If `get_all_instances` returns multiple reservations, the old wait loop only
dealt with the first reservation. Thus, the wait loop may end before all
instances get to be running/stopped.

Also clean up the code a little.
2014-05-09 11:35:48 +08:00
James Cammarata
9d3583cab3 Merge pull request #7055 from bpennypacker/rds_modify
cloud/rds : renaming an rds instance always fails
2014-05-08 21:10:47 -05:00
James Cammarata
5c18af1afa Merge branch 'orgoj-docker_image-patch-notag' into devel 2014-05-08 21:05:19 -05:00
James Cammarata
ebac5dfbce Updating docstring for docker_image based on new default for tag 2014-05-08 21:04:55 -05:00
James Cammarata
34e52c5884 Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag 2014-05-08 21:03:57 -05:00
James Cammarata
f426bf5bd1 Merge branch 'bibliotechy-git-submodule-when-recursive-true' into devel 2014-05-08 20:58:38 -05:00
James Cammarata
8dd91021f4 Merge branch 'git-submodule-when-recursive-true' of https://github.com/bibliotechy/ansible into bibliotechy-git-submodule-when-recursive-true 2014-05-08 20:47:10 -05:00
James Cammarata
e35fe17eef Merge branch 'jimbydamonk-elb_subnets' into devel 2014-05-08 19:32:39 -05:00
James Cammarata
39433949e0 Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets 2014-05-08 19:28:54 -05:00
James Cammarata
4358c846a0 Merge branch 'brian-brazil-devel' into devel 2014-05-08 16:47:21 -05:00
James Cammarata
b97f087f18 Fixing a typo in the monit module (status and not status()) 2014-05-08 16:46:32 -05:00
James Cammarata
a969941b85 Merge branch 'devel' of https://github.com/brian-brazil/ansible into brian-brazil-devel 2014-05-08 16:11:18 -05:00
James Cammarata
d9bb1a480a Merge pull request #7013 from orgoj/replace-patch-changed
module replace - report changed only if contents is changed
2014-05-08 15:14:19 -05:00
James Cammarata
8f9e7e0e7e Merge branch 'ebrevdo-vpc_fix' into devel 2014-05-08 15:10:49 -05:00
James Cammarata
3ac4943751 Some cleanup for the rds/vpc_security_groups fix 2014-05-08 15:08:43 -05:00
James Cammarata
768de238d4 Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix 2014-05-08 14:39:07 -05:00
James Cammarata
7dda178a5b Merge branch 'tyll-warn_wrong_sudo_password' into devel 2014-05-08 14:22:09 -05:00
James Cammarata
51ef28b0d2 Merge branch 'warn_wrong_sudo_password' of https://github.com/tyll/ansible into tyll-warn_wrong_sudo_password 2014-05-08 14:16:58 -05:00
James Cammarata
1a52fcce03 Merge pull request #7335 from napkindrawing/patch-1
Route53 module handling of domains with "*" is broken
2014-05-08 14:02:00 -05:00
James Cammarata
943723f28e Merge pull request #7334 from lamby/devel
Fail if monit reload failed; don't mask the error.
2014-05-08 14:01:17 -05:00
James Laska
346d02e3b4 Improve OFFICIAL build conditional test
An unofficial build is any build where OFFICIAL != yes.  This patch adjusts the
conditional accordingly.
2014-05-08 14:57:14 -04:00
James Laska
eede23ab0d Add support for rpm builds through mock 2014-05-08 14:47:20 -04:00
napkindrawing
011ec5d9e6 Fix to unescape * was discarded by unescape of @
`decoded_name` was created twice, each from `rset.name`

So, the second call to `.replace(r'\100', '@')` overwrites decoded_name, discarding the result of the call to `.replace(r'\052', '*')`

I had a problem with wildcard domains that was fixed by this patch.
2014-05-08 14:20:32 -04:00
James Cammarata
2e2e5d5321 Use the existing module_vars during the templating of module_vars
Since some of the vars contained in there may be used in the templating
of other variables. This also reverts e83a494 which originally fixed
issue #6979 but broke some other variable related things.

Fixes #6979
Fixes #7321
Fixes #7332
2014-05-08 13:09:36 -05:00
Chris Lamb
f510389298 Fail if monit reload failed; don't mask the error.
This is necessary for the scenario when you push a new, broken monit
config out, and then set a state=reloaded handler - the error was
previously swallowed so you could end up with successful play but missing
monitoring (!).

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
2014-05-08 18:18:28 +01:00
Luca Berruti
a3d1f06cb2 Make alternatives module python 5 compatible 2014-05-08 14:46:49 +02:00
James Cammarata
713657d684 Make sure the default ec2_group egress rule is not removed
Upon a second run, the default egress rule will be removed when a
vpc is specified but no other egress rules were set. This patch
corrects that behavior by removing the default egress rule from the
list of unmatched outbound rules.

Fixes #7309
2014-05-07 20:52:03 -05:00
James Cammarata
77a47dbb2d Merge pull request #7304 from jimi-c/issue_7296_synchronize_relative_path
Make sure dwim'd relative path ends in a "/" if the original does
2014-05-07 12:58:04 -05:00
James Cammarata
82fd70b74d Merge branch 'drybjed-debian_version' into devel 2014-05-07 10:21:20 -05:00
James Cammarata
cef86335da Merge branch 'debian_version' of https://github.com/drybjed/ansible into drybjed-debian_version 2014-05-07 10:21:03 -05:00
James Cammarata
bd56cfdf18 Merge pull request #7313 from mmoya/doc-fixes
Minor typo fix
2014-05-07 10:12:26 -05:00
James Cammarata
393124e462 Add pyc/pyo to ignore list for inventory directories
Fixes #7308
2014-05-07 09:59:13 -05:00
James Cammarata
21f8c0bc96 Merge branch 'cchurch-devel' into devel 2014-05-07 09:12:10 -05:00
James Cammarata
b71a451ed0 Close fds when running commands from the accelerate daemon
Fixes #7307
2014-05-07 08:47:38 -05:00
James Laska
d314f1b038 [test_apt_repository] Verify that 'python-apt' auto-installs correctly
Remove 'python-apt' before testing the 'apt_repository' module.  The
'apt_repository' module has the smarts to auto-install python-apt.  The
integration test will now assert the correct auto-install behavior.
2014-05-07 09:28:01 -04:00
James Cammarata
c584b6b53d Merge branch 'devel' of https://github.com/cchurch/ansible into cchurch-devel 2014-05-07 08:18:29 -05:00
Maciej Delmanowski
8e38225521 Synchronize .deb package version with VERSION file 2014-05-07 15:12:08 +02:00
James Cammarata
5c70f39213 Close fds when running commands from the accelerate daemon
Fixes #7307
2014-05-07 08:10:57 -05:00
Maykel Moya
1d3ce41e83 Fix typo 2014-05-07 10:35:16 +02:00
Brian Coca
8a84b22d76 bumped to 1.7 2014-05-06 23:43:07 -04:00