Commit graph

11262 commits

Author SHA1 Message Date
James Cammarata
5d65c1c4a4 Merge branch 'Mbosco-patch-1' into devel 2014-06-23 13:00:51 -05:00
James Cammarata
6bd0621037 Merge branch 'devel' of https://github.com/ansible/ansible into devel 2014-06-23 12:59:12 -05:00
James Cammarata
1702c2fd50 Merge branch 'patch-1' of https://github.com/Mbosco/ansible into Mbosco-patch-1 2014-06-23 12:57:13 -05:00
James Cammarata
5ad7dcf4f0 Merge pull request #6766 from Jmainguy/mysql_db_bug
mysql_db module now correctly fails on import if bz2 or gz fails.
2014-06-23 12:42:42 -05:00
James Cammarata
9564818e1e Merge branch 'fix_lineinfile_newlines' into devel 2014-06-23 12:38:12 -05:00
James Cammarata
2bfdad1e86 Merge pull request #7904 from loglevel9/7903
force evaluation of vars memory_mb, num_cpus to be int fixes #7903
2014-06-23 12:35:08 -05:00
James Cammarata
59c5d6292b Merge pull request #7902 from jirutka/filter-relpath
Add os relpath filter
2014-06-23 12:33:30 -05:00
James Cammarata
eef05f7b31 Merge branch 'botify-labs-bug/fix-health-check-to-zero-bug/7898' into devel 2014-06-23 12:32:01 -05:00
James Cammarata
9137679e59 Merge branch 'bug/fix-health-check-to-zero-bug/7898' of https://github.com/botify-labs/ansible into botify-labs-bug/fix-health-check-to-zero-bug/7898 2014-06-23 12:31:15 -05:00
James Cammarata
ce41b02300 Merge pull request #7887 from s0x/funtoo-gathering-facts
Check for empty os-release file, fixes #7885
2014-06-23 12:28:32 -05:00
James Cammarata
5d4046204b Merge pull request #7893 from botify-labs/feature/add-launch-group-sport-support
Adding support for spot instances in ansible_lc.
2014-06-23 12:09:02 -05:00
James Cammarata
095dffcfc2 Merge branch 'amenonsen-upgrade-release' into devel 2014-06-23 11:12:57 -05:00
James Cammarata
67fb2e653e Merge branch 'upgrade-release' of https://github.com/amenonsen/ansible into amenonsen-upgrade-release 2014-06-23 10:35:48 -05:00
Dann Bohn
677e99e375 force evaluation of vars memory_mb, num_cpus to be int fixes #7903 2014-06-23 11:16:03 -04:00
Jakub Jirutka
726a61eb43 Add os relpath filter 2014-06-23 16:10:07 +02:00
Chris Church
65a8ffef6e Merge pull request #7900 from cchurch/fix_remote_chmod
Fix missing arg for _remote_chmod method.
2014-06-23 06:13:00 -04:00
Frédéric de Villamil
1f3663b196 Adds support for health_check_period and health_check_type in ec2_asg module.
Default is set to 300 seconds, which is AWS default.

This PR fixes a bug (#7898) where instances created within an autoscaling group using the `ec2_asg` module gets immediately terminated because the `health_check_period` is set to 0, which causes the instance to be checked without having the time to actually boot.

Adding `health_check_type` is needed because you may want to check your instance health against an ELB instead of just EC2 default cloudwatch.
2014-06-23 12:09:31 +02:00
Chris Church
6aaad5dc9b Fix missing arg for _remote_chmod method. 2014-06-23 06:09:08 -04:00
Frédéric de Villamil
93daebe1e2 Adding support for spot instances in ansible_lc.
AWS allows to define launch configuration with spot instances. This is also natively supported by boto (see http://boto.readthedocs.org/en/latest/ref/autoscale.html)
2014-06-23 09:05:47 +02:00
Michael DeHaan
9631309433 Update CHANGELOG.md 2014-06-22 12:26:49 -04:00
Michael DeHaan
4acc93b665 Merge pull request #7889 from chrishoffman/win_group
Adding win_group module
2014-06-22 11:26:27 -05:00
Michael DeHaan
558f4d7b1a Merge pull request #7886 from chrishoffman/win_service
Bugfix and better error propagation for win_service module
2014-06-22 11:24:49 -05:00
Chris Hoffman
0dab7b014b Adding win_group module 2014-06-22 09:01:04 -04:00
Ivo Senner
f4fd9d366b Check for empty os-release file, fixes #7885 2014-06-22 04:08:59 +02:00
Chris Hoffman
1c2d244964 Fixing bug with stopped state 2014-06-21 22:01:02 -04:00
Chris Hoffman
844e90093b Better propagation of cmdlet errors 2014-06-21 21:59:53 -04:00
Chris Hoffman
31f5069212 Using generic windows service for example 2014-06-21 21:58:26 -04:00
Michael DeHaan
122fff970f Merge pull request #7880 from yuyak/fix_typo_in_apt_doc
Fix typo in apt module documentation
2014-06-21 11:32:08 -05:00
Michael DeHaan
1d632d65ae Merge pull request #7881 from cchurch/devel
Fix typo in powershell setup module.
2014-06-21 11:31:35 -05:00
Michael DeHaan
3be827f1c9 Merge pull request #7882 from chrishoffman/win_service
Adding win_service module
2014-06-21 11:30:11 -05:00
Chris Hoffman
8af38ae436 Adding win_service module 2014-06-21 12:04:11 -04:00
Chris Church
f59041871e Fix typo in powershell setup module. 2014-06-21 10:27:43 -04:00
yuyak
5482208eee Fix typo in apt module documentation 2014-06-21 21:27:57 +08:00
James Cammarata
59698e7fbf Merge pull request #7876 from chrishoffman/shell_expand_roles_path
Shell expand DEFAULT_ROLES_PATH fixes #4897
2014-06-21 00:53:30 -05:00
James Laska
4046d1fd0d Correct Makefile variable usage 2014-06-20 19:59:09 -04:00
Chris Hoffman
cf997beb07 Shell expand DEFAULT_ROLES_PATH fixes #4897 2014-06-20 19:23:46 -04:00
James Cammarata
70abc6f6de Merge pull request #7374 from hfinucane/wait_for_pipes
Allow wait_for to wait on non-traditional files
2014-06-20 15:55:10 -05:00
James Laska
411311495f Updated DEB build workflow
Updates to Makefile include:
 * add targets: deb-src, deb-src-upload, deb-upload
 * add variables to control DEB building: DEBUILD_OPTS, DPUT_OPTS, DEB_PPA, DEB_DIST, DEB_RELEASE
 * create deb files for all release values in DEB_DIST

Several updates to packaging/debian/*
 * Updated control file
 * Whitespace/formatting of changelog

Add deb-build to .gitignore
2014-06-20 16:09:02 -04:00
James Cammarata
1c3a654912 Conditionally try to get ebs_optimized parameter from instance 2014-06-20 14:26:21 -05:00
James Cammarata
38c29e1fff Merge branch 'issue_7368' into devel 2014-06-20 14:08:45 -05:00
Yap Sok Ann
f80467e013 ec2_vpc: Fix error when using InstanceId as a route gateway.
See https://github.com/ansible/ansible/issues/7368

Fixes #7368
2014-06-20 14:08:22 -05:00
James Cammarata
9896898902 Merge branch 'psa-exit_json' into devel 2014-06-20 14:00:17 -05:00
James Cammarata
1c318fa3bd Merge branch 'exit_json' of https://github.com/psa/ansible into psa-exit_json 2014-06-20 13:59:55 -05:00
James Cammarata
06e0e1f770 Merge branch 'ajsalminen-lvg_dm_names' into devel 2014-06-20 13:27:04 -05:00
James Cammarata
8e0148f084 Merge branch 'lvg_dm_names' of https://github.com/ajsalminen/ansible into ajsalminen-lvg_dm_names 2014-06-20 13:24:07 -05:00
James Cammarata
94963290b9 Merge pull request #6981 from aliles/fix-localhost-executable-with-flags
Fix localhost tasks with complex executables
2014-06-20 12:51:54 -05:00
James Cammarata
d0a115972a Merge branch 'pkit-git_fix' into devel 2014-06-20 12:48:32 -05:00
James Cammarata
1864347f44 Merge branch 'git_fix' of https://github.com/pkit/ansible into pkit-git_fix 2014-06-20 12:47:21 -05:00
James Cammarata
cc9658463b Merge pull request #7868 from simono/patch-1
win_feature: Fix Description.
2014-06-20 11:29:22 -05:00
James Cammarata
bba4f58240 Merge pull request #7856 from njharman/devel
Lineinfile now supports symlinks.
2014-06-20 11:14:43 -05:00