Commit graph

5269 commits

Author SHA1 Message Date
Toshio Kuratomi
67aeab9576 Merge pull request #512 from mscherer/fix_438
Revert commit cbc417c, as the code is broken, see #438
2014-12-16 22:46:20 -08:00
Toshio Kuratomi
b1605ae6b5 Merge pull request #505 from sysadmin75/9518
Fixes #9518 - "file state=directory" silently skips if it's currently a ...
2014-12-16 14:00:09 -08:00
Toshio Kuratomi
9c6826e928 Add text/json as a mimetype to try deserializing
Fixes #503
2014-12-16 13:55:08 -08:00
Toshio Kuratomi
07989f1f49 Merge pull request #526 from Jmainguy/centos5_hostname
Fixed hostname for rhel5 python 2.4.3
2014-12-16 13:35:51 -08:00
Toshio Kuratomi
51ed13b887 Fix documentation build 2014-12-16 11:50:41 -08:00
Jonathan Mainguy
541070be4c Fixed hostname for rhel5 python 2.4.3 2014-12-16 09:49:13 -05:00
Brian Coca
54b836f0b8 Merge pull request #89 from cchurch/win_feature_updates
Updates to win_feature module
2014-12-15 20:15:13 -05:00
Brian Coca
58bfebb047 Merge pull request #384 from jhawkesworth/win_copy_file_template_ansible_modules_core_1
Win copy/file/template modules (for ansible-modules-core)
2014-12-15 20:10:18 -05:00
Brian Coca
27dee77ca0 Merge pull request #84 from cchurch/win_user_updates
Updates for win_user module
2014-12-15 20:03:48 -05:00
Brian Coca
4cfc8d6950 Merge pull request #72 from stewrutledge/vmtemplate
Added support for deploying virtual machine from a virtual template
2014-12-15 20:01:54 -05:00
Toshio Kuratomi
f87afc090c Merge pull request #158 from ajsalminen/git_dereference_annotated_tag
[git] Find the actual commit annotated tags refer to instead of the tag object.
2014-12-15 15:16:53 -08:00
Toshio Kuratomi
7af2d3f5f7 Merge pull request #92 from astorije/expand_user_git_key_file
Expand the user home folder in the key_file argument of the git module
2014-12-15 13:38:18 -08:00
Toshio Kuratomi
7350d2cc7f Add error message from git to message returned from ansible
Fixes #81
2014-12-15 13:34:03 -08:00
Toshio Kuratomi
b0c94cd6f6 Merge pull request #281 from kustodian/postgresql_db_fix_for_python_24_checkmode
Fixed postgresql_db failing on Python 2.4 with --check
2014-12-14 13:43:44 -08:00
Michael Scherer
39cd64ec17 Revert commit cbc417c, as the code is broken, see #438
LooseVersion expect a string, so filtering to return a int
is incorrect. Thanks to Jeremy Brown for the analysis.
2014-12-14 21:59:44 +01:00
sysadmin75
0fee1132ad Fixes #9518 - "file state=directory" silently skips if it's currently a file 2014-12-13 15:14:32 -05:00
kustodian
07b98c45df Fixed postgresql_db failing on Python 2.4 with --check
This reverts commit 81cbdb6c8c and adds ignoring of the SystemExit exception because of Python 2.4.
2014-12-13 17:24:10 +01:00
Toshio Kuratomi
bfc1644b34 Merge pull request #501 from mikeputnam/devel
Type fix on delete_snapshot docs.
2014-12-12 12:54:45 -08:00
Toshio Kuratomi
e1f90635af Don't traceback if a gid is specified instead of a group name
Fixes https://github.com/ansible/ansible/issues/9796
2014-12-12 12:08:03 -08:00
Mike Putnam
5c6f375c17 Type fix on delete_snapshot docs. 2014-12-12 13:29:51 -06:00
Toshio Kuratomi
f4625a3dd1 Fixup the directory name at a higher level so it can be used by both conditional branches
Fixes #500
2014-12-12 11:23:17 -08:00
Brian Coca
242a1562c3 Merge pull request #36 from mscherer/fix_old_9092
Fix old ticket #9092 where a playbook can enter in recursion
2014-12-11 20:54:54 -05:00
Jon Hawkesworth
08c5cc06c6 Switched to SHA1 checksum instead of MD5 2014-12-11 21:50:17 +00:00
Jon Hawkesworth
732491eb93 Adding first pass at win_copy, win_file and win_template modules (include new files). 2014-12-11 21:50:17 +00:00
Jon Hawkesworth
2e60425b71 Adding first pass at win_copy, win_file and win_template modules. 2014-12-11 21:50:17 +00:00
Brian Coca
e396611206 Merge pull request #495 from bcoca/hostname_gentoo_fix
fixed hostname for gentoo
2014-12-11 16:43:20 -05:00
Matt Martz
7a6a30abbe Merge pull request #492 from sivel/rax-asg-improvements
Make a few enhancements to the rax_scaling_group module
2014-12-11 12:59:16 -06:00
Matt Martz
9eb2bff946 Make a few enhancements to the rax_scaling_group module
* Cast loadbalancer id and port to integers
* Do not attempt to base64 encode NoneType values
2014-12-11 12:58:12 -06:00
Brian Coca
3799ca48ea Merge pull request #498 from hhamalai/devel
Fixed typo in comment
2014-12-11 12:09:17 -05:00
Harri Hämäläinen
b354423bae Fixed typo in comment 2014-12-11 18:59:42 +02:00
Brian Coca
ba139b145b fixed hostname for gentoo 2014-12-11 09:05:27 -05:00
Toshio Kuratomi
6cf34406b8 Merge pull request #488 from Ernest0x/patch-2
mysql_user: Added missing privileges
2014-12-11 06:02:01 -08:00
Toshio Kuratomi
467ad65f73 Fix documentation formatting 2014-12-10 11:17:16 -08:00
Petros Moisiadis
bd7c6dbd3a mysql_user: Added missing privileges
Added missing privileges 'CREATE TABLESPACE' and 'PROXY' (see: http://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html).
2014-12-10 18:53:55 +02:00
Brian Coca
7e2fbec944 Merge pull request #480 from andrewjshults/mysql-multiline-permissions
Strip white space to support multiline permissions in YAML
2014-12-10 09:57:45 -05:00
Brian Coca
c83f9bea5d Merge pull request #482 from PikachuEXE/devel
~ Add missing documentation for option `email`
2014-12-10 09:56:42 -05:00
PikachuEXE
6ce7e63c5f ~ Add missing documentation for option email 2014-12-10 10:23:59 +08:00
Andrew Shults
8396c063a3 Strip white space to support multiline permissions in YAML 2014-12-09 17:14:16 -05:00
Brian Coca
cd2406528c Merge pull request #478 from mikeputnam/devel
Clarify possible variable value in the docs.
2014-12-09 12:39:26 -05:00
Toshio Kuratomi
375025d2e3 Change git update param documentation to match reality 2014-12-09 09:02:05 -08:00
Toshio Kuratomi
2493dda4e5 Before pulling submodules from repos add ssh hostkeys for those submodules
Fixes #9655
2014-12-09 08:20:57 -08:00
Mike Putnam
55a51f4ca9 Clarify possible variable value in the docs. 2014-12-09 10:09:05 -06:00
Toshio Kuratomi
abff6c2582 Merge pull request #472 from ansible/git-cleanup
Git cleanup
2014-12-09 07:39:51 -08:00
Toshio Kuratomi
050a462b2a Fix git mod so that we switch to the desired version even if it was previously downloaded 2014-12-08 22:08:50 -08:00
Toshio Kuratomi
b326201a65 Some cleanups to the git module 2014-12-08 22:08:25 -08:00
Toshio Kuratomi
586d012c47 Revert git module doc update because it appears ssh:// works and bare ssh repo does not
This reverts commit e715909831.
2014-12-08 16:48:53 -08:00
Toshio Kuratomi
106d390bfc Merge pull request #404 from lorin/git-ssh
git doc: don't prepend ssh:// for ssh repo
2014-12-08 16:30:03 -08:00
Michael DeHaan
95aa8481b2 Merge pull request #466 from marcus-ahle/devel
Preventing Nonetype is not iterable error when no tags are set for new ASG
2014-12-08 14:26:16 -08:00
Michael DeHaan
766973993a Merge pull request #457 from bwhaley/devel
vpc_zone_identifier should be a list as per the docs
2014-12-08 14:24:17 -08:00
Michael DeHaan
5089c101b5 Merge pull request #453 from pitabwire/patch-1
Update django_manage to add database option for migrate
2014-12-08 14:23:50 -08:00