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

933 commits

Author SHA1 Message Date
Christoph Dwertmann
0d2ac3ce62 Don't use deprecated BaseException.message in keystone_user 
fixes error "failed to parse: <attribute 'message' of 'exceptions.BaseException' objects>
TypeError: <attribute 'message' of 'exceptions.BaseException' objects> is not JSON serializable"
 2014-06-02 15:11:53 +10:00
Matt Martz
aaf880af19 Mention that user_data can be a file path or a string 2014-06-01 14:47:01 -05:00
Matt Martz
2c7b70d140 Switch functions over to kwargs to make it easier to manage in the future 2014-06-01 14:45:54 -05:00
Matt Martz
5b4f8d76c7 Add user_data and config_drive support 2014-06-01 14:42:58 -05:00
Matt Martz
ce38f006a3 Add rax_meta module 
Also update rax to mirror meta value normalization from rax_meta
 2014-06-01 14:31:26 -05:00
Michael DeHaan
416705e5e2 Merge pull request #6863 from sivel/rax-untouched 
rax module: Return untouhced servers with exact_count
 2014-06-01 15:27:45 -04:00
CorbanR
18d6cc88f7 updating example, to be more consistent with parameter names 2014-05-30 15:57:55 -06:00
Sean Whitbeck
723a86c792 Add azure VM provisioning/termination module 2014-05-29 17:29:09 -07:00
Krzysztof Warzecha
4594978981 vsphere_guest: Add support for setting hardware version (should fix #7206) 2014-05-30 00:01:39 +02:00
James Cammarata
741cc7ac33 Merge pull request #7536 from fly/linode-warn-ssl 
warn if remote SSL cert is not checked in linode
 2014-05-27 16:38:33 -05:00
Jon Chen
798b4bdf1b require pycurl for linode module 2014-05-27 14:37:44 -04:00
Matt Martz
3d808e8e94 Don't fail in rax_cbs when the volume is not found 2014-05-25 19:39:43 -05:00
Matt Martz
392ca3f343 Add PTR record support to rax_dns_record 2014-05-22 18:12:56 -05:00
Michael DeHaan
03b91976c4 Merge pull request #7501 from sivel/rax-dns-serial-doc 
Add notes to rax_dns and rax_dns_record to recommend using serial: 1
 2014-05-22 14:10:43 -04:00
Matt Martz
5a278022df Add notes to rax_dns and rax_dns_record to recommend using serial: 1 2014-05-22 11:58:28 -05:00
Matt Martz
25577423d4 Allow public_key to be a path to a file 2014-05-21 12:28:18 -05:00
Atlas Health
dfc21ced6a Stopped instances can also be terminated 2014-05-21 07:18:30 -07:00
Andrew Snare
1277a20bcc Support internal-only ELBs in EC2. 2014-05-20 22:21:14 +02:00
Matt Bray
901feb91fc docker: fix targetting images by name 2014-05-15 15:04:30 +01:00
James Cammarata
5ae08e1699 During vsphere config check attempt cast before marking values missing 
Fixes #7385
 2014-05-14 15:57:26 -05:00
James Cammarata
8622a3f396 Merge pull request #7404 from jimi-c/issue_7363_docker_names 
Make sure the docker data has a "Names" field before using it
 2014-05-14 14:44:16 -05:00
Konstantin Shabanov
f9e6db7886 Fix env splitting in docker module 
ENV variable value could contain '=' (for example mysql://host/db?pool=10)
 2014-05-14 18:11:43 +04:00
James Cammarata
8c2d409467 Correctly cast the size_gb value for vpshere disks 
Fixes #7385
 2014-05-13 15:13:13 -05:00
Carson Gee
5a170295ef Fix missing variable initialization so an unspecified internal_network runs 2014-05-13 09:56:13 -04:00
Matt Martz
dc3d22cf0d Handle ValueError during json.loads of json data from build 2014-05-12 14:16:07 -05:00
James Cammarata
b59e4e8222 Make sure the docker data has a "Names" field before using it 
Fixes #7363
 2014-05-12 12:27:07 -05:00
James Cammarata
f0db516a2d Merge pull request #7346 from tongpu/devel 
Add documentation for required parameter name to quantum_subnet
 2014-05-09 16:21:28 -05:00
Johannes 'fish' Ziemke
ac14a016c4 Fix: Remove check for Ghost state 
This fixed the just committed change handling non existent Ghost state.
 2014-05-09 20:13:25 +02:00
James Cammarata
b5ba1c4527 Merge pull request #7338 from discordianfish/remove-ghost-state 
Remove check for Ghost state
 2014-05-09 13:06:16 -05:00
Johannes 'fish' Ziemke
dccf70ec0b Remove check for Ghost state 
This doesn't exist anymore and causes ansible to throw a KeyError
 2014-05-09 18:07:02 +02:00
Lukas Grossar
096b47fba6 Add documentation for required parameter name to quantum_subnet 2014-05-09 15:17:04 +02:00
Herby Gillot
9989374f68 rds module: Fix undeclared reference to "params" when setting password in 
modify mode.
 2014-05-09 05:49:11 -04:00
James Cammarata
4e7542315c Merge pull request #7110 from orgoj/docker-patch-version_comment 
module docker - add docker version comment
 2014-05-09 00:57:41 -05:00
James Cammarata
9b3ac5a253 Fixing a doc mistake in the ec2 module from 4269bb6 2014-05-09 00:21:35 -05:00
James Cammarata
052f6e6d1d Merge branch 'ec2-start-stop' of https://github.com/sayap/ansible into sayap-ec2-start-stop 2014-05-09 00:04:34 -05:00
Yap Sok Ann
d2329baa93 ec2: Fix bug with running/stopped state and wait=yes. 
If `get_all_instances` returns multiple reservations, the old wait loop only
dealt with the first reservation. Thus, the wait loop may end before all
instances get to be running/stopped.

Also clean up the code a little.
 2014-05-09 11:35:48 +08:00
James Cammarata
45501e57bd Merge pull request #7055 from bpennypacker/rds_modify 
cloud/rds : renaming an rds instance always fails
 2014-05-08 21:10:47 -05:00
James Cammarata
d1fbb7cdfe Updating docstring for docker_image based on new default for tag 2014-05-08 21:04:55 -05:00
James Cammarata
b759dd194c Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag 2014-05-08 21:03:57 -05:00
James Cammarata
83e14ffb6d Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets 2014-05-08 19:28:54 -05:00
James Cammarata
fd50dda268 Some cleanup for the rds/vpc_security_groups fix 2014-05-08 15:08:43 -05:00
James Cammarata
5eea0d0f0c Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix 2014-05-08 14:39:07 -05:00
napkindrawing
6bda82c907 Fix to unescape * was discarded by unescape of @ 
`decoded_name` was created twice, each from `rset.name`

So, the second call to `.replace(r'\100', '@')` overwrites decoded_name, discarding the result of the call to `.replace(r'\052', '*')`

I had a problem with wildcard domains that was fixed by this patch.
 2014-05-08 14:20:32 -04:00
Paul Armstrong
ba52d02b31 Add proper state output to ec2_asg, ec2_metric_alarm, ec2_scaling_policy 2014-05-08 15:51:07 +00:00
James Cammarata
eb61c3737c Make sure the default ec2_group egress rule is not removed 
Upon a second run, the default egress rule will be removed when a
vpc is specified but no other egress rules were set. This patch
corrects that behavior by removing the default egress rule from the
list of unmatched outbound rules.

Fixes #7309
 2014-05-07 20:52:03 -05:00
Maykel Moya
da5204e58b Fix typo 2014-05-07 10:35:16 +02:00
James Cammarata
4b2a56fb03 Fixing two bugs in the ec2_elb_lb module 
* the current state of the ELB was not reflected properly when checking
  the status after a change was made.
* invalid zones caused a traceback when enabling/disabling zones
 2014-05-05 12:48:45 -05:00
James Cammarata
19a77228d3 Removing zone choices that overly-limit available zones for gce 
Fixes #7270
 2014-05-05 11:58:39 -05:00
Kesten Broughton
068cb9af59 if key name already exists on tenant, check if public_key is offered that it matches the existing key 2014-05-02 11:09:54 -05:00
willthames
44eb585e74 Improve the ec2_snapshot argument spec and docs 
ec2_snapshot got missed when moving to a common argument spec.
It could already make use of the capabilities (as it uses
ec2_connect) and the documentation suggested it supported the
common argument spec (thanks to the documentation fragment work)
so it was just a matter of fixing the argument spec.

Removed unnecessary documentation for profile and security_token
that is covered by documentation fragment

Also removed spurious documentation flags (default: null, aliases: [])
which aren't needed.
 2014-05-01 13:11:41 +10:00
James Cammarata
b08ce87429 Merge pull request #7230 from binarytemple/fix_for_issue_7228 
fix issue #7228 ec2_vol crash
 2014-04-30 08:30:27 -05:00
bryan hunt
9fe00396ab fix issue #7228 ec2_vol crash 2014-04-30 10:43:05 +01:00
Atlas Health
4e4d4370c1 added example 2014-04-29 17:13:25 -04:00
Atlas Health
eba4d83827 updated docs to include snapshot_tags option 
added version
 2014-04-29 17:13:25 -04:00
James Cammarata
ba06269655 Merge branch 'patch-2' of https://github.com/budlight/ansible into budlight-patch-2 2014-04-29 15:58:05 -05:00
Michael DeHaan
de3f7e4225 Merge pull request #6794 from follower/patch-4 
Make `vpc_security_group` docs more accurate
 2014-04-29 15:49:57 -04:00
James Cammarata
3d9c5ceafd Merge pull request #7212 from jimi-c/issue_7027_ec2_group_egress_rules 
Make sure a default allow out rule exists if no other egress rules do
 2014-04-29 10:39:36 -05:00
James Cammarata
09e675290a Merge pull request #7190 from jimi-c/issue_7180_vsphere_guest_hardware_variable_casts 
Make sure values are integers for certain hardware items for vpshere_guest
 2014-04-28 21:00:46 -05:00
James Cammarata
2b3d39ddd3 Merge branch 'elb' of https://github.com/bpennypacker/ansible into bpennypacker-elb 2014-04-28 20:39:10 -05:00
James Cammarata
075c3bcfa3 Make sure values are integers for certain hardware items for vpshere_guest 
Fixes #7180
 2014-04-28 11:40:00 -05:00
Ben Holloway
0830d9eed5 documentation fix 2014-04-24 17:58:39 -06:00
Ben Holloway
c20f6b58c7 attempt to set availability_zones to all if neither availability_zones or vpc_identifier are set 2014-04-24 17:56:26 -06:00
Bruce Pennypacker
8baeccacab removed unwanted 'if wait else None' 2014-04-24 20:41:51 +00:00
Ben
008905f58d documentation fix availability_zones should be required for ec2_asg 2014-04-24 11:56:25 -06:00
Ben
834115290d updated example to include instance_type 2014-04-24 11:50:49 -06:00
Ben
06ff535098 Added instance_type to ec2_lc variable list 2014-04-24 11:47:41 -06:00
James Cammarata
404412f254 Fixing the version_added string in the vsphere_guest module 2014-04-23 22:46:14 -05:00
James Cammarata
6aaf249847 Merge branch 'vmware_core' of https://github.com/rhoop/ansible into rhoop-vmware_core 2014-04-23 21:12:40 -05:00
npeters
43ac7a7984 Remove invalid variable 2014-04-24 01:12:55 +02:00
James Cammarata
98d949e143 Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check 
docker: exclude 'entrypoint' from comparing 'command' param with containers
 2014-04-23 16:14:48 -05:00
Richard Hoop
2364ede3fc Author 2014-04-23 16:53:12 -04:00
James Cammarata
f068a4f26a Merge pull request #6991 from joshuaconner/bugfix_dont_send_wrong_params_to_dockerclient_start 
Docker: don't send wrong parameters to client.start()
 2014-04-23 15:48:04 -05:00
Richard Hoop
f6e6b313b7 Ready for pull request 2014-04-23 16:44:49 -04:00
Richard Hoop
f09ecf2239 Core complete 2014-04-23 15:26:03 -04:00
James Cammarata
3b78b05816 Merge pull request #6599 from dmage/nova_region_name 
use region_name in nova_compute
 2014-04-23 10:15:57 -05:00
James Cammarata
566a284186 Merge pull request #6985 from jimi-c/issue_6763_ec2_vpc_params 
Ensure params were set in ec2_vpc before accessing them
 2014-04-23 10:08:50 -05:00
Richard Hoop
149a740a1c Started reconfigured 2014-04-23 09:53:12 -04:00
Ted Timmons
118ed766e6 update documentation to include missing option 
'list' was added more recently, it was omitted from the documentation.
 2014-04-23 08:44:43 -05:00
Richard Hoop
b81d5d532e Creation complete 2014-04-22 17:12:23 -04:00
Richard Hoop
a956522363 More config checks and clean up for vm_config settings 2014-04-22 16:20:04 -04:00
Bruce Pennypacker
733508d07f Changed behavior of deregister. If an instance is not found in the ELB then simply return 'changed=false'. Otherwise always remove the instance from the ELB no matter what state its currently in. 2014-04-22 18:44:41 +00:00
Mike Buzzetti
657edc2116 Updated and corrected example section 2014-04-22 09:27:26 -04:00
Michael Heca
ae8b942e4a module docker - add docker version comment 
Default docker version 0.9.1 from Ubuntu 14.04 LTS don't report APIVersion.
 2014-04-22 12:21:51 +02:00
Mike Buzzetti
83507a90bc Adding support for purging subnets 2014-04-21 21:42:05 -04:00
Richard Hoop
3dca5d510a Large cleanups. Reintegrating all modules together for a guest 2014-04-21 16:38:31 -04:00
CaptTofu
45d2cab30c Small bug - 'acts' should be 'facts' 2014-04-21 08:06:00 -07:00
Bruce Pennypacker
f3e22024c5 Fix for https://github.com/ansible/ansible/issues/7054 - when renaming an instance and waiting for the change to occur, force result.id to the name of the new instance so the subsequent call to get_current_resource succeeds. 2014-04-18 17:56:11 +00:00
Michael Heca
cac1b1caf0 module docker_image - default tag latest 
Fix constant rebuild of image if no tag specified.
 2014-04-18 16:14:12 +02:00
Mike Buzzetti
88b1efa7be Adds support for VPC subnets to ELB 2014-04-18 09:59:35 -04:00
Joshua Conner
0ce43d6e3c docker: exclude 'entrypoint' from comparing 'command' param with containers 
The JSON the Docker API returns includes the container's ENTRYPOINT value (if it has one) with the 'Command' value. So instead of checking if `container['Command'] == module.params['command']`, we just check that `container['Command'].endswith(module.params['command'])` so the entrypoint won't affect a container being properly classified as matching the module params or not.

Also I refactored a super-long `if` statement into some temporary variables - I did it to help me figure out what was going wrong, and then it makes the code more readable so I kept it.
 2014-04-17 16:10:53 -07:00
Joshua Conner
bac2e879b2 docker: send 1.10 params if docker-py is new enough version 2014-04-17 16:05:50 -07:00
James Cammarata
10923b1c11 Make sure a default allow out rule exists if no other egress rules do 
Fixes #7027
 2014-04-17 15:24:18 -05:00
Matt Bray
afd0e78f16 docker.client.APIError has moved to docker.errors.APIError 
see 18d4db09ec
 2014-04-16 23:42:56 +01:00
James Cammarata
019c515a0b Check resource_tags value before using it in ec2_vpc 
Fixes #7024
 2014-04-16 12:21:32 -05:00
evanccopengeo
ab8f9544a6 cleaning up the code a bit more 2014-04-15 18:16:34 -04:00
evanccopengeo
2ab68cba0c fixing bug where if both private_ip and assign_public_p are set ansible fails out 2014-04-15 17:55:26 -04:00
Joshua Conner
6bf75de95c Docker: don't send wrong parameters to client.start() 
As part of being updated for the 1.10 API, a couple of parameters were passed to the docker.client.start() command that it doesn't accept. This caused the module to error out if it tried to start any Docker containers. This removes those parameters so the module works again.
 2014-04-14 15:05:42 -07:00
James Cammarata
af58d6e8f5 Ensure params were set in ec2_vpc before accessing them 
Fixes #6763
 2014-04-14 10:58:07 -05:00
Chris Conway
ce38619394 Adds version_added property to new attributes in gce and gce_pd. 2014-04-14 08:33:45 -07:00
Michael DeHaan
7fb26f43a3 Merge pull request #6956 from mattjbray/docker-1-10-volumes-from-dns 
docker: from API 1.10 dns and volumes_from should be passed to start()
 2014-04-14 11:29:10 -04:00
Chris Conway
dc8a7775f0 Adds support for attaching persistent disks to GCE instances 2014-04-13 18:38:31 -07:00
Chris Conway
03250b0ace Adds support for creating GCE persistent disks from snapshots 2014-04-13 18:38:31 -07:00
Chris Conway
c631178db0 Adds support for creating GCE persistent disks from images 2014-04-13 18:38:31 -07:00
Michael J. Schultz
fb10556f3e cloud/elasticache: Ensure self.data is iterable 
- self.data['SecurityGroups'] can return None causing traceback, if that
  is the case fallback to an empty list
 2014-04-11 18:23:53 -05:00
Matt Bray
3d20c585a6 docker: from API 1.10 dns and volumes_from should be passed to start() 2014-04-11 17:08:55 +01:00
Eugene Brevdo
898375418d VPC security group membership fix for boto. 
* facts now provides a list of existing vpc security group memberships
* adding a comma separated list of sg-* tags properly modifies membership
 2014-04-09 13:32:47 -07:00
Will Thames
a203485e8b Use common code for ec2_elb and ec2_elb_lb 
Uses the new get_aws_connection_info
and connect_to_aws common methods to reuse code

Now complains if region is not set in one of the
three possible methods

Also moved over to common documentation code so
this is actually based on #6913
 2014-04-09 22:47:51 +10:00
willthames
d1a7fca7f3 Moved AWS modules over to common module fragments 
Created common module doc fragment, and applied to all
modules that use ec2_connect or connect_to_aws as
they definitely share the common doc fragments
 2014-04-09 21:19:12 +10:00
James Tanner
74c5b8b3bb Fix version added for new parameters in quantum modules 2014-04-08 10:32:53 -04:00
James Tanner
fc362c5f5c Fix version_added for login_tenant_name in keystone_user 2014-04-08 10:25:44 -04:00
James Tanner
2f474fc4d5 Fix version_added for new params in gce_pd 2014-04-08 10:05:57 -04:00
James Tanner
644c635513 Fix version_added for new params in gce_net 2014-04-08 10:03:56 -04:00
James Tanner
bd25a999da Fix version_added for new params in gce_lb 2014-04-08 10:00:30 -04:00
James Tanner
15701ffaa4 Set version_added for snapshot in ec2_vol 2014-04-07 23:10:24 -04:00
Michael DeHaan
17bf7d7a74 Merge pull request #6850 from atlashealth/ec2_set_ebs_optimized 
ec2: added ability to set EBS optimized instances
 2014-04-07 15:57:34 -04:00
James Tanner
08e75935db Fixes #6780 Update version_added for source_dest_check in ec2 module 2014-04-07 12:44:34 -04:00
James Cammarata
37c1b7bf6e Merge branch 'rax-clb-nodes-nodeid' of https://github.com/sivel/ansible into sivel-rax-clb-nodes-nodeid 2014-04-07 07:40:05 -05:00
Matt Martz
a191688c71 Simplify node matching 2014-04-06 19:17:13 -05:00
Atlas Health
b3f74ac03e moved ebs_optimized param out of main request hash 2014-04-06 15:35:22 -07:00
Michael DeHaan
e39d37db2a Merge pull request #6864 from sivel/rax-add-shared-mod-docs 
Shared module docs for remaining rax modules
 2014-04-05 15:16:11 -04:00
Matt Martz
ac6082e303 Shared module docs for remaining rax modules 2014-04-04 13:02:49 -05:00
Matt Martz
9a19792eff Allow respecification of a node without requiring node_id 2014-04-04 12:41:57 -05:00
Matt Martz
9178ed1dbd Return untouhced servers with exact_count 2014-04-04 12:15:35 -05:00
Ted Timmons
6b5e79c442 cloudformation's disable_rollback must be a bool 
passing "yes" to boto causes severe problems.
 2014-04-04 08:00:56 -07:00
Michael DeHaan
baa76d81e3 Merge pull request #6849 from atlashealth/ec2_snapshot_fixed_type_issue 
ec2_snapshot: fix for "unknown type number requested for wait_timeout"
 2014-04-03 18:01:22 -04:00
Matt Martz
61ace3a03c rax modules improvements 
* Catch issues with invalid regions
* Ensure we send string only data as meta values in the rax module
* Add public_key/lookup example for rax_keypair
* Clean up import statements
 2014-04-03 17:16:24 -04:00
Matt Martz
aaf766595b Use PluginLoader for module docs fragments 2014-04-03 16:52:39 -04:00
Matt Martz
681c5aea3a Add support for shared module documentation fragments 2014-04-03 16:52:39 -04:00
Atlas Health
3e86baf6fa ec2: added ability to set EBS optimized instances 
added version
 2014-04-03 12:38:43 -07:00
Atlas Health
7b4fe54690 fixed error related to type being defined as a number 2014-04-03 12:24:05 -07:00
James Tanner
1dead65ff7 Fixes #6454 verify ec2 key fingerprints 2014-04-03 13:53:43 -04:00
Paul Durivage
dee5d58493 Fix issue where a container is created but is not indicating that the state was changed 2014-04-02 18:05:36 -05:00
Michael DeHaan
d9876343b1 Merge pull request #6798 from follower/patch-5 
Clarify the port value always defaults to 3306
 2014-04-02 17:34:33 -04:00
Michael DeHaan
91dba74bf9 Merge pull request #6770 from lemonlatte/fix_default_uri_of_get_xml 
Fix the default url of get_xml function.
 2014-04-02 17:23:22 -04:00
James Cammarata
c98f4c698c Adding wait/wait_timeout parameters to the ec2_key module 
Fixes #6455
 2014-04-01 22:14:35 -05:00
jctanner
aa37c862db Merge pull request #6805 from sivel/env-interpreter-fix 
Fix interpreter lines in a couple of modules
 2014-04-01 15:03:20 -04:00
Matt Martz
a4078a4bf8 Use /usr/bin/python instead of /usr/bin/env python 2014-04-01 13:54:37 -05:00
follower
6a78e9e416 Clarify the port value always defaults to 3306 
While the [boto docs](https://github.com/boto/boto/blob/develop/boto/rds/__init__.py#L253) make it seem like the default value of `port` is changed depending on the engine chosen, AFAICT from looking at the code the default value is never changed from 3306.

I think the docs are intended to be read as "the default value used by <engine> is <port> so you should change `port` to that value".

If you don't specify the port value and chose the database engine as PostgreSQL you'll end up with a PostgreSQL instance running on port 3306.
 2014-04-02 02:25:14 +13:00
jjshoe
167ca65fcb module_retention isn't defined anywhere, including the help. 2014-04-01 07:49:51 -05:00
follower
1e32467f62 Make vpc_security_group docs more accurate 
Without the `subnet` parameter supplied there's an error `msg: Parameter vpc_security_groups invalid for create command`. (This might be a bug?)

If the VPC security group name rather than ID is supplied there's an error: `msg: Invalid security group , groupId= <some group name>, groupName=.` (Accepting a group name might be a feature enhancement.)

In my case I set the subnet as `default` and used `register` to get the result of the security group creation section and just referred to its `group_id` property.
 2014-04-02 01:06:45 +13:00
Jim Yeh
afa1d91782 Fix the default url of get_xml function. 
* This enable a user to configure uri in get_xml function
 2014-03-31 11:05:31 +08:00
Matt Way
df9fe6c2b8 don't parse empty stream chunks 2014-03-30 15:27:29 -04:00
James Laska
eff2dc23c7 Use proper YAML quotes to fix webdocs 2014-03-30 14:26:18 -04:00
James Cammarata
a21ab1a94f Removing wait loop around initial state check during registration 
Also fixed a bug in which the state parameter was marked as a 'bool'
type, which was breaking execution of the module.

Fixes #6543
 2014-03-29 23:47:11 -05:00
James Laska
f5f726d371 Fix YAML docstring that broke webdocs 2014-03-29 19:15:42 -04:00
Cristian Ciupitu
03eb65f25d Bugfix for gc_storage and s3 
Make keysum return None if not key_check (this case wasn't covered).
 2014-03-28 22:47:46 +02:00
Michael DeHaan
5fc8a6bbd9 Merge pull request #6081 from alexanderpopov1/ec2_vpc-subnet-tagging 
Added support for tagging subnets in ec2_vpc module
 2014-03-28 15:27:59 -04:00
Michael DeHaan
8d0b4e1147 Add version_added to docs. 2014-03-28 13:51:22 -04:00
Michael DeHaan
8ba2b7f8eb Merge branch 'aws-ec2-egress-rules' of git://github.com/mmoya/ansible into devel 2014-03-28 13:50:58 -04:00
Michael DeHaan
be4e728a8e Merge branch 'ec2_vpc-multiple-vpcs-support' of git://github.com/alexanderpopov1/ansible into devel 
Conflicts:
	library/cloud/ec2_vpc
 2014-03-28 12:51:40 -04:00