Commit graph

11274 commits

Author SHA1 Message Date
James Cammarata
0e5b0a2e97 Revert "Set Jinja2's keep_trailing_newline=True in template_from_string."
This reverts commit 7a8eb0b670.
2014-07-17 09:07:04 -05:00
James Laska
03efbfca29 Correct string concatenation error 2014-07-17 08:57:47 -04:00
Michael DeHaan
515d10fd88 Merge pull request #8172 from phenomenes/channel-key-parameter
Adds channel key parameter
2014-07-17 08:14:26 -04:00
Michael DeHaan
bc194740c8 Merge pull request #8166 from scottbrown/bugfix-ansible-vault-read-password-does-not-close-file-handle
Fixing improperly closed file handle in ansible vault
2014-07-17 08:06:17 -04:00
Michael DeHaan
3aa10d9db5 Merge pull request #8145 from amandolo/ec2_tag
Fix EC2_TAG module output structure when listing tags
2014-07-17 07:45:53 -04:00
Jimena Cabrera-Notari
7efd8b61a6 Adds channel key parameter 2014-07-16 21:44:52 +01:00
Michael DeHaan
64b874129f Merge pull request #8139 from peterkh/devel
Fix "TypeError: group id must be integer" if groupid passed in for group key
2014-07-16 15:55:14 -04:00
Michael DeHaan
ec874193fe Merge pull request #8143 from PinGwynn/feature
portage: default exit (not fail) if sync=yes in check mode
2014-07-16 15:51:56 -04:00
James Cammarata
62e9cf63b7 Merge pull request #8170 from sergevanginderachter/issue_8159
Load existing group_vars file for new group_by group
2014-07-16 14:28:14 -05:00
James Cammarata
db15b778a8 Merge branch 'leverich-devel' into devel 2014-07-16 14:25:47 -05:00
Serge van Ginderachter
4e9a253bef Load existing group_vars file for new group_by group
if it was not loaded yet, which happens if that group
didn't exist yet in the inventory.

fixes #8159
2014-07-16 21:16:27 +02:00
James Cammarata
42b5294820 Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel 2014-07-16 14:02:13 -05:00
James Cammarata
297593b27d Merge branch 'napkindrawing-patch-2' into devel 2014-07-16 13:52:52 -05:00
James Cammarata
68e59332c7 Merge branch 'patch-2' of https://github.com/napkindrawing/ansible into napkindrawing-patch-2 2014-07-16 13:46:00 -05:00
James Cammarata
ac73822405 Expand target for mysql_db
Fixes #8128
2014-07-16 13:39:47 -05:00
James Cammarata
d7469218a5 Merge pull request #8126 from dingus9/patch-1
Update lineinfile validate help
2014-07-16 13:28:21 -05:00
James Cammarata
02a6d5224f Merge pull request #8124 from dataxu/dev-asg-set-health-checks
Added setting of the health_check options on an existing ASG
2014-07-16 13:19:52 -05:00
Scott Brown
5849bb3dba Fixing bug where the file handle is not closed properly because the parentheses are left off the call, telling Python to return a method but not call the method. 2014-07-16 08:48:41 -07:00
Michael DeHaan
616d749ab3 Merge pull request #8156 from jirutka/fix-layman
layman: remove my email address
2014-07-16 11:22:13 -04:00
James Cammarata
3492e8748e Merge pull request #8146 from rmarchei/8102
fix get_distribution_version() on amazon linux
2014-07-16 09:57:28 -05:00
James Cammarata
19571d3f23 Merge pull request #7914 from hacosta/devel
Correctly handle .repo files in zypper_repository module
2014-07-16 09:55:35 -05:00
James Cammarata
1bdbea1a6b Merge pull request #8122 from tgerla/ubuntu-docs-fix
Docs: fix the name of the package that provides apt-add-repository on Ubuntu
2014-07-16 09:50:49 -05:00
Ruggero Marchei
8904c61932 fix LooseVersion exception with empty distribution_version 2014-07-16 07:55:20 +02:00
Jakub Jirutka
437dc0a9ef layman: remove my email address 2014-07-16 01:29:36 +02:00
Michael DeHaan
ca918cd3dd Merge pull request #8118 from oxyrox/devel
Typo
2014-07-15 18:15:08 -04:00
Michael DeHaan
ee179e1149 Merge pull request #8111 from hfinucane/gh-8108
Fix pip failure when version is parsed as a float
2014-07-15 18:07:03 -04:00
Michael DeHaan
8da853ec7a Slight typo fix. 2014-07-15 18:08:11 -04:00
Michael DeHaan
3d1865e6c9 Pagerduty has advocated not using ansible for certain sizes of infrastructure. This module is removed until this is corrected.
http://blog.pagerduty.com/2014/06/10-common-ops-mistakes/?utm_source=twitter&utm_medium=social&utm_campaign=blog
2014-07-15 18:07:24 -04:00
Michael DeHaan
8f97f8a5f1 Merge pull request #8107 from hfinucane/optional-rsync-compress
Make 'compress' optional
2014-07-15 18:05:25 -04:00
Michael DeHaan
50f51367f9 Merge pull request #8106 from muff1nman/pacman-update-checkmode-fix
Fix #8047
2014-07-15 18:04:50 -04:00
Ruggero Marchei
909955f2e2 fix get_distribution_version() on amazon linux 2014-07-15 18:04:46 +02:00
James Cammarata
4b8dcb2ae4 Merge pull request #8135 from rmarchei/8102
fix issue #8102
2014-07-15 09:28:17 -05:00
Maxim Odinintsev
a587d13c65 portage: default exit (not fail) if sync=yes in check mode 2014-07-15 16:04:19 +03:00
Andrea Mandolo
d346b76fb7 Fix EC2_TAG module output structure when listing tags 2014-07-15 14:26:53 +02:00
Peter Hall
09a5d8f6d1 Fix "TypeError: group id must be integer" if groupid passed in for group
key
2014-07-15 11:16:47 +10:00
Ruggero Marchei
d6bca15aa5 fix issue #8102 2014-07-15 01:26:44 +02:00
Chris Church
f063aafeeb Merge pull request #8119 from adamchainz/devel
Fix indentation in ec2.py
2014-07-14 18:09:50 -04:00
Jacob Leverich
7a8eb0b670 Set Jinja2's keep_trailing_newline=True in template_from_string.
Without this setting, the newline idempotence of scalar strings changes depending on whether
or not they contain any Jinja2 template blocks.
2014-07-14 13:36:17 -07:00
James Cammarata
7c6175e780 Merge branch 'sivel-task-host-loop-bypass' into devel 2014-07-14 14:38:25 -05:00
James Cammarata
b3f298fcb7 Adding run_once feature to CHANGELOG 2014-07-14 14:38:03 -05:00
James Cammarata
e74853300a Merge branch 'task-host-loop-bypass' of https://github.com/sivel/ansible into sivel-task-host-loop-bypass 2014-07-14 14:21:25 -05:00
James Cammarata
fd3d10980e Merge branch 'sivel-wait-for-port-search-regex' into devel 2014-07-14 14:15:21 -05:00
James Cammarata
eb80bd1a56 Break out of loop for sockets in wait_for when there's no data to read 2014-07-14 14:14:13 -05:00
napkindrawing
fe74cb0ad0 New option for route53: retry_interval
The current (hard-coded) retry interval of 500 seconds can cause ansible to have excessive run-times in the case of many domains. `retry_interval` provides a way to customize the wait between retries of calls to route53.
2014-07-14 15:07:47 -04:00
James Cammarata
d80f4cee9d Merge branch 'wait-for-port-search-regex' of https://github.com/sivel/ansible into sivel-wait-for-port-search-regex 2014-07-14 13:16:11 -05:00
Nick Shobe
d1ebf7fcf1 Update lineinfile 2014-07-14 13:09:57 -05:00
James Cammarata
4be891f68c Merge branch 'sivel-rax-ptr' into devel 2014-07-14 12:31:06 -05:00
James Cammarata
49d07ca4cc Adding a note about 'type' field becoming required in rax_dns_record 2014-07-14 12:30:39 -05:00
James Cammarata
b2f09d3989 Merge branch 'rax-ptr' of https://github.com/sivel/ansible into sivel-rax-ptr 2014-07-14 12:27:46 -05:00
Matt Ferrante
66d3d75b35 Added setting of the health_check options on an existing ASG 2014-07-14 13:21:02 -04:00