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
Serge van Ginderachter
6b1cb22fc3
Allow hash_behaviour=merge to be respected in core inventory
...
(For now, this means, enable it also for inventory scripts)
2014-03-11 12:49:54 +01:00
Serge van Ginderachter
29c60bdaff
group_vars plugin: do not parse hidden files in subfolders, e.g. avoid .svn/
2014-03-11 12:20:58 +01: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
Richard C Isaacson
16c05cbc88
Update files for 1.5.1 release.
2014-03-10 17:40:36 -05:00
Franck Cuny
fb14b53130
Document the module_lang option.
...
Closes #6169 .
2014-03-10 15:19:05 -07:00
Matt Martz
6607010b2b
Fix ad-hoc command examples
2014-03-10 16:49:45 -05:00
Michael DeHaan
43203bac56
Update the message about pycrypto to include that python-devel must be installed.
2014-03-10 17:25:11 -04:00
Michael DeHaan
2fa6110961
Update the message about pycrypto to include that python-devel must be installed.
2014-03-10 17:23:37 -04:00
James Tanner
2d478b1627
Implement new default cipher class AES256
2014-03-10 16:17:23 -05:00
James Tanner
0d6f6ad282
Implement new default cipher class AES256
2014-03-10 16:15:44 -05:00
Michael DeHaan
20f0157152
Merge pull request #6378 from franckcuny/headers-gce-utils
...
Add BSD license to module_utils/gce.py
2014-03-10 16:14:51 -05:00
James Tanner
a02641c020
Force command action to not be executed by the shell unless specifically enabled
2014-03-10 16:13:48 -05:00
James Tanner
ba0fec4f42
Force command action to not be executed by the shell unless specifically enabled
2014-03-10 16:13:30 -05:00
James Cammarata
5bc6eafba5
Validate SSL certs accessed through urllib*
...
* Adds another module utility file which generalizes the
access of urls via the urllib* libraries.
* Adds a new spec generator for common arguments.
* Makes the user-agent string configurable.
Fixes #6211
2014-03-10 16:09:59 -05:00
James Cammarata
9730157525
Validate SSL certs accessed through urllib*
...
* Adds another module utility file which generalizes the
access of urls via the urllib* libraries.
* Adds a new spec generator for common arguments.
* Makes the user-agent string configurable.
Fixes #6211
2014-03-10 16:06:52 -05:00