cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9468 commits 47 branches 390 tags 440 MiB
Commit graph

9468 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard C Isaacson
85b3c4d907 nova_compute: Adding the version_added flag to user_data. 
Per note in GH-5916.
 2014-03-11 13:45:04 -05:00
Richard Isaacson
971199d433 Merge pull request #6403 from risaacson/nova_group 
Nova group
 2014-03-11 13:35:02 -05:00
Richard C Isaacson
e6d099852e Bump relased in version and update module snippets. 
Closes GH-5069
 2014-03-11 13:33:18 -05:00
Richard Isaacson
cdea88661e Merge pull request #6402 from risaacson/nova-fip 
Nova fip
 2014-03-11 13:29:01 -05:00
Richard C Isaacson
5fdf7f9f75 Bump relased in version and update module snippets. 
Closes GH-5154
 2014-03-11 13:25:16 -05:00
Vadim Kuznetsov
546d514f87 bug 5959: https://github.com/ansible/ansible/issues/5959 2014-03-11 13:41:50 -04:00
James Cammarata
b95fe470c4 Fixing up some docstrings causing make webdocs to fail 2014-03-11 12:29:02 -05:00
Michael DeHaan
998b986c59 Merge pull request #6394 from jlaska/gitignore_test_output 
Add generated test files to .gitignore
 2014-03-11 11:40:03 -05:00
James Tanner
3d07db26e3 Update docstring in digital_ocean for backups_enabled version_added 2014-03-11 12:17:29 -04:00
jctanner
bfd9323274 Merge pull request #5935 from zimbatm/do-backups 
library/digital_ocean: Adds the missing backups_enabled create option
 2014-03-11 12:16:12 -04:00
James Tanner
351ebd0b43 Update docstrings in ec2_ami_search 2014-03-11 12:14:14 -04:00
James Cammarata
b10d174ab4 Merge branch 'silkapp-ec2-eip-reuse' into devel 2014-03-11 11:13:01 -05:00
James Cammarata
2b84a40d8e Renaming reuse parameter in ec2_eip and adding a version_added string 2014-03-11 11:12:23 -05:00
jctanner
7a45e04777 Merge pull request #4845 from lorin/ec2_ubuntu_ami 
New module: ec2_ami_search
 2014-03-11 12:11:49 -04:00
James Cammarata
89c091d689 Merge branch 'ec2-eip-reuse' of https://github.com/silkapp/ansible into silkapp-ec2-eip-reuse 2014-03-11 11:09:26 -05:00
James Tanner
f0704159ae Update docstrings in ec2_vol 2014-03-11 12:02:04 -04:00
James Cammarata
67e9cbe637 Merge branch 'josephtate-devel' into devel 2014-03-11 11:00:40 -05:00
jctanner
7dcc8e2460 Merge pull request #5287 from ebrevdo/ec2_vol_existing 
ec2_vol module: add support for name / id to mount volume on instance
 2014-03-11 11:58:36 -04:00
James Cammarata
5d4980459f Merge branch 'drcapulet/ec2-sourcedestcheck' of https://github.com/drcapulet/ansible into drcapulet-drcapulet/ec2-sourcedestcheck 2014-03-11 10:56:44 -05:00
jctanner
b2539ae5d8 Merge pull request #5454 from claco/rax_identity 
Add rax_identity module
 2014-03-11 11:51:30 -04:00
James Cammarata
eabcbb830f Merge branch 'willthames-ec2_security_token' into devel 2014-03-11 10:48:52 -05:00
jctanner
e658dc292b Merge pull request #5703 from ethercrow/fakes3 
[s3] Compatibility with fakes3.
 2014-03-11 11:48:21 -04:00
James Cammarata
8ca3bb4137 Updating profile/security_token version_added labels 2014-03-11 10:48:16 -05:00
Michael DeHaan
40b82a33c0 Merge pull request #5916 from tidzo/issue4992 
Fix for #4992 - Add userdata to cloud/nova_compute
 2014-03-11 10:45:40 -05:00
James Cammarata
430cce9df3 Merge branch 'ec2_security_token' of https://github.com/willthames/ansible into willthames-ec2_security_token 2014-03-11 10:45:38 -05:00
James Tanner
cd3fcd843a Set version-added for new parameters in ec2_elb_lb and elasticache 2014-03-11 11:44:47 -04:00
Michael DeHaan
2e10e1e0d6 Merge pull request #5997 from jonasi/elasticache_vpc_security_groups 
Elasticache vpc security groups
 2014-03-11 10:42:13 -05:00
Michael DeHaan
2df40933f1 Merge pull request #6262 from willthames/ec2_tags_print 
Allow ec2_tag module to print the tags of an instance
 2014-03-11 10:33:07 -05:00
Michael DeHaan
faef76b818 Merge pull request #6264 from sqs/cloud-rds-add-new-db-instance-types 
Add new cloud/rds DB instance types (db.m3 and db.cr1 families)
 2014-03-11 10:32:39 -05:00
Michael DeHaan
ab80d1c62b Merge pull request #5899 from jjneely/ec2.py 
ec2.py: Make sure ec2_placement gets handled correctly
 2014-03-11 10:25:01 -05:00
Michael DeHaan
10f852a807 Update version_added for wait_timeout parameter on elb module. 2014-03-11 11:22:17 -04:00
Michael DeHaan
f6878d4ada Merge pull request #6020 from bpennypacker/ec2_elb_timeout 
cloud/ec2_elb module: Added wait_timeout parameter
 2014-03-11 10:21:38 -05:00
Michael DeHaan
003a405182 Merge pull request #6104 from gianlucaborello/digitalocean_fix_deletion 
Make sure droplet deletion works even when idempotency is achieved using 'name' and 'unique_name' rather than 'id'
 2014-03-11 10:20:43 -05:00
Michael DeHaan
f824a846bc Merge pull request #6230 from joshuaconner/bugfix_nova_computer_partial_server_name_match 
nova_compute: fix for partial match b/w params['name'] and an existing name
 2014-03-11 10:20:02 -05:00
Michael DeHaan
1eed6f46bf Merge pull request #6306 from willthames/ec2_module_clearer_failures 
Make it easier to determine whether instance creation or tagging fails
 2014-03-11 10:18:50 -05:00
Michael DeHaan
3af6befbae Merge pull request #6324 from scottanderson42/bugfix/route53-characters 
BUGFIX: route53 module won't round-trip * and @ in records
 2014-03-11 10:18:23 -05:00
Michael DeHaan
5978567509 Merge pull request #6366 from cloudify/devel 
Fix for #6365: cloudformation module fails to update if stack exists
 2014-03-11 10:17:47 -05:00
Michael DeHaan
fd9df5f429 Merge pull request #6372 from mriedelumab/devel 
Returning 'NA' when no virtualization found
 2014-03-11 10:17:22 -05:00
Michael DeHaan
247d688c13 Merge pull request #6233 from garethr/aws-autoscaling-groups 
Added modules to manage ec2 autoscaling groups
 2014-03-11 10:15:40 -05:00
Michael DeHaan
297b048d0e Fix other reference to APT_ENV_VARS. 2014-03-11 10:47:53 -04:00
James Laska
7345495655 Add generated test files to .gitignore 2014-03-11 09:21:33 -04:00
Michael DeHaan
c09d4b1c7a Update apt module so that environment variables are set correctly since not going through shell. Very sorry folks, it will be addressed. 2014-03-11 08:39:28 -04:00
James Tanner
7f028c101c Fix changelog dates in ansible.spec 2014-03-10 21:37:34 -04:00
James Tanner
cc1537e4cc Remove remnant merge conflict lines from ansible.spec 2014-03-10 21:37:34 -04:00
Michael DeHaan
84f918d320 Merge pull request #6381 from franckcuny/doc-module-lang 
Document the module_lang option.
 2014-03-10 20:35:04 -05:00
Michael DeHaan
efdefe6c64 Merge pull request #6380 from sivel/best-practice-adhoc 
ad-hoc doc fixes
 2014-03-10 20:34:30 -05:00
James Tanner
6740a1f342 Wrap crypto.hash imports with try/except 2014-03-10 19:44:08 -04:00
Michael DeHaan
0f962dba14 Missing comma in argument spec. 2014-03-10 19:37:34 -04:00
Michael DeHaan
411bcb7161 Merge remote branch 'real/devel' into devel 2014-03-10 19:11:21 -04:00
James Tanner
7b6d5e7bbf Fix merge conflicts from 1.5.1 release notes 2014-03-10 18:55:17 -04:00