Commit graph

10535 commits

Author SHA1 Message Date
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
Chris Church
f9c74d6e57 Add integration tests for group_by module. Fixed bug introduced by ansible/ansible#7273 while also fixing issue described in ansible/ansible#6953 2014-05-06 22:30:37 -04:00
James Cammarata
4d118d1c72 Make sure dwim'd relative path ends in a "/" if the original does
Fixes #7296
2014-05-06 13:54:41 -05:00
James Cammarata
51dfd18e1f Merge pull request #7301 from berendt/check_against_lowered_sha256sum
[get_url] check against lowered stripped sha256sum
2014-05-06 11:35:24 -05:00
Christian Berendt
2c39eff60e [get_url] check against lowered stripped sha256sum
The content of the sha256sum attribute should be lowered before comparing it with the calculated sha256sum.

In the following example the used sha256sum uses ABC.. and not abc.. and the check failed. This should not happen.

```
TASK: [get_url url=http://ftp.fau.de/apache/hadoop/common/hadoop-2.4.0/hadoop-2.4.0.tar.gz dest=/home/vagrant/hadoop-2.4.0.tar.gz mode=0644 sha256sum=024326AC68A1A68B5566B10F95609EAAFD9F70CFEB37FCA0E97CBB1674E57C3A] ***
failed: [instance000] => {"failed": true}
msg: The SHA-256 checksum for /home/vagrant/hadoop-2.4.0.tar.gz did not match 024326AC68A1A68B5566B10F95609EAAFD9F70CFEB37FCA0E97CBB1674E57C3A; it was 024326ac68a1a68b5566b10f95609eaafd9f70cfeb37fca0e97cbb1674e57c3a.

FATAL: all hosts have already failed -- aborting
```
2014-05-06 18:27:43 +02:00
James Cammarata
537494c2d6 Make sure distro variable is set if python-apt is installed
Fixes #7295
2014-05-06 09:42:50 -05:00
James Cammarata
941af22d5d Merge pull request #7294 from adamchainz/patch-1
Fix sync_binlog name in mysql_variables example
2014-05-06 08:18:05 -05:00
James Cammarata
7bf86ec1c0 Merge branch 'fixing_apache2_module' of https://github.com/berendt/ansible into berendt-fixing_apache2_module 2014-05-06 08:02:21 -05:00
Adam Chainz
967de3cdf9 Fix sync_binlog name in mysql_variables example
The previous sync_binary_log is not a real MySQL variable.
2014-05-06 12:25:11 +01:00
Michael DeHaan
b6b76fe7f2 Update CHANGELOG.md 2014-05-05 17:45:04 -04:00
Michael DeHaan
1b36362b4e Update RELEASES.txt 2014-05-05 17:43:40 -04:00
James Cammarata
56d070afa8 Version bump for 1.7 2014-05-05 16:37:46 -05:00
James Cammarata
ab5500072b Update packaging dates for the 1.6.0 release 2014-05-05 16:35:36 -05:00
James Cammarata
84e13e5f4c Make sure amazon test doesn't check host keys 2014-05-05 15:07:59 -05:00
James Cammarata
64d6a300b5 Merge pull request #7282 from ephur/gitignore_egginfo
ignore remnants from doing a setup.py install
2014-05-05 14:42:59 -05:00