ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
11525 commits 10 branches 167 tags 272 MiB
Commit graph

946 commits

Author SHA1 Message Date
James Cammarata
5bd8cd6e00 Cleaning up azure module 
* Fixed error messages to be more descriptive
* Removed direct use of subprocess module and replaced it with calls
  to module.run_command
* Changed AZURE_MANAGEMENT_CERT_PATH to be just AZURE_CERT_PATH, which
  matches what is expected by the inventory script
 2014-06-06 15:58:28 -05:00
Matt Martz
ad5cf5d55d Add Rackspace Autoscale modules 
- rax_scaling_group
- rax_scaling_policy
 2014-06-06 11:30:07 -05:00
James Cammarata
e083168773 Merge branch 'devel' of https://github.com/jwhitbeck/ansible into jwhitbeck-devel 2014-06-06 11:19:43 -05:00
James Cammarata
bd5cf57e76 Merge pull request #7653 from evanccopengeo/devel 
ec2_group: Fix for 500 error when creating new security groups
 2014-06-06 10:34:42 -05:00
James Cammarata
9cb05a0845 Catch failed connection due to a bad region in ec2_scaling_policy 
Fixes #7505
 2014-06-05 19:40:21 -05:00
James Cammarata
a760299170 Catch failed connection due to a bad region in ec2_scaling_policy 
Fixes #7506
 2014-06-05 16:44:55 -05:00
Kevin Bell
e0a4c389f3 Fixed asg instance count polling 2014-06-05 16:18:31 -05:00
Kevin Bell
426a827b46 Fix default availability zone list 2014-06-05 16:18:31 -05:00
James Cammarata
26aaa7bcdd Fix typo in nova_keypair import of exceptions from novaclient 
Fixes #7640
 2014-06-05 15:42:38 -05:00
James Cammarata
b3bbca03d5 Add additional params to get_target_from_rule method in ec2_group 
Fixes #7592
 2014-06-04 13:52:44 -05:00
James Cammarata
9f0d496d67 Fixing version_added strings for new features in ec2_elb_lb 
Fixes #7631
 2014-06-04 13:37:04 -05:00
James Cammarata
609fd2e993 Merge branch 'rax-meta' of https://github.com/sivel/ansible into sivel-rax-meta 2014-06-04 11:02:35 -05:00
evanccopengeo
fac9a64d23 fixing problem where ansible would error out because Amazon was saying the group didnt exist yet (needed to wait a few more seconds for amazon to propagate correctly) 2014-06-03 14:25:48 -04:00
Christoph Dwertmann
5cab159bda 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
7dd5b731d2 Mention that user_data can be a file path or a string 2014-06-01 14:47:01 -05:00
Matt Martz
70881d5489 Switch functions over to kwargs to make it easier to manage in the future 2014-06-01 14:45:54 -05:00
Matt Martz
4ca7840861 Add user_data and config_drive support 2014-06-01 14:42:58 -05:00
Matt Martz
84b1f21617 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
6bc056e012 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
42f54238e4 updating example, to be more consistent with parameter names 2014-05-30 15:57:55 -06:00
Sean Whitbeck
796d8db860 Add azure VM provisioning/termination module 2014-05-29 17:29:09 -07:00
Krzysztof Warzecha
8326b7672a vsphere_guest: Add support for setting hardware version (should fix #7206) 2014-05-30 00:01:39 +02:00
James Cammarata
ba641de69e 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
be7ff82e2d require pycurl for linode module 2014-05-27 14:37:44 -04:00
Matt Martz
27ac5b1856 Don't fail in rax_cbs when the volume is not found 2014-05-25 19:39:43 -05:00
Matt Martz
576224e202 Add PTR record support to rax_dns_record 2014-05-22 18:12:56 -05:00
Michael DeHaan
ee82681d14 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
413243186d Add notes to rax_dns and rax_dns_record to recommend using serial: 1 2014-05-22 11:58:28 -05:00
Matt Martz
73c67cea91 Allow public_key to be a path to a file 2014-05-21 12:28:18 -05:00
Atlas Health
26c2491583 Stopped instances can also be terminated 2014-05-21 07:18:30 -07:00
Andrew Snare
0cc6c479bc Support internal-only ELBs in EC2. 2014-05-20 22:21:14 +02:00
Matt Bray
8363ab5a6f docker: fix targetting images by name 2014-05-15 15:04:30 +01:00
James Cammarata
67d8df0e32 During vsphere config check attempt cast before marking values missing 
Fixes #7385
 2014-05-14 15:57:26 -05:00
James Cammarata
154ef942eb 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
ad9225895b 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
19dbff916f Correctly cast the size_gb value for vpshere disks 
Fixes #7385
 2014-05-13 15:13:13 -05:00
Carson Gee
e6fbd2d8cb Fix missing variable initialization so an unspecified internal_network runs 2014-05-13 09:56:13 -04:00
Matt Martz
92b77048dc Handle ValueError during json.loads of json data from build 2014-05-12 14:16:07 -05:00
James Cammarata
bfc1201ecd Make sure the docker data has a "Names" field before using it 
Fixes #7363
 2014-05-12 12:27:07 -05:00
James Cammarata
62c4a15c73 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
ea71c0c317 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
c97dec9d75 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
b9d9ef511f 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
0aa4cb9a79 Add documentation for required parameter name to quantum_subnet 2014-05-09 15:17:04 +02:00
Herby Gillot
efbe4ca8d5 rds module: Fix undeclared reference to "params" when setting password in 
modify mode.
 2014-05-09 05:49:11 -04:00
James Cammarata
5c7109b8b9 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
0215134907 Fixing a doc mistake in the ec2 module from 4269bb6 2014-05-09 00:21:35 -05:00
James Cammarata
48e2a5e5a2 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
4269bb6a45 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
9d3583cab3 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
ebac5dfbce Updating docstring for docker_image based on new default for tag 2014-05-08 21:04:55 -05:00
James Cammarata
34e52c5884 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
39433949e0 Merge branch 'elb_subnets' of https://github.com/jimbydamonk/ansible into jimbydamonk-elb_subnets 2014-05-08 19:28:54 -05:00
James Cammarata
3ac4943751 Some cleanup for the rds/vpc_security_groups fix 2014-05-08 15:08:43 -05:00
James Cammarata
768de238d4 Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix 2014-05-08 14:39:07 -05:00
napkindrawing
011ec5d9e6 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
7d28f30bda Add proper state output to ec2_asg, ec2_metric_alarm, ec2_scaling_policy 2014-05-08 15:51:07 +00:00
James Cammarata
713657d684 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
1d3ce41e83 Fix typo 2014-05-07 10:35:16 +02:00
James Cammarata
d6fc9f1dfc 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
faf733bc49 Removing zone choices that overly-limit available zones for gce 
Fixes #7270
 2014-05-05 11:58:39 -05:00
Kesten Broughton
aee1a97102 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
44662a3d33 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
ce48e1f9ff 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
88aaa70f0c fix issue #7228 ec2_vol crash 2014-04-30 10:43:05 +01:00
Atlas Health
49d0ad0644 added example 2014-04-29 17:13:25 -04:00
Atlas Health
4258eb6be7 updated docs to include snapshot_tags option 
added version
 2014-04-29 17:13:25 -04:00
James Cammarata
04793ff640 Merge branch 'patch-2' of https://github.com/budlight/ansible into budlight-patch-2 2014-04-29 15:58:05 -05:00
Michael DeHaan
d5e254d3c7 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
d2819e22e3 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
67092039d7 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
826198196b Merge branch 'elb' of https://github.com/bpennypacker/ansible into bpennypacker-elb 2014-04-28 20:39:10 -05:00
James Cammarata
50cd3a4a8f Make sure values are integers for certain hardware items for vpshere_guest 
Fixes #7180
 2014-04-28 11:40:00 -05:00
Ben Holloway
e45d33954b documentation fix 2014-04-24 17:58:39 -06:00
Ben Holloway
4596521147 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
dc912ca201 removed unwanted 'if wait else None' 2014-04-24 20:41:51 +00:00
Ben
5a39672efa documentation fix availability_zones should be required for ec2_asg 2014-04-24 11:56:25 -06:00
Ben
30b634eae9 updated example to include instance_type 2014-04-24 11:50:49 -06:00
Ben
9770c7f47d Added instance_type to ec2_lc variable list 2014-04-24 11:47:41 -06:00
James Cammarata
3f1545f9db Fixing the version_added string in the vsphere_guest module 2014-04-23 22:46:14 -05:00
James Cammarata
833ceeca24 Merge branch 'vmware_core' of https://github.com/rhoop/ansible into rhoop-vmware_core 2014-04-23 21:12:40 -05:00
npeters
61bb40c0dd Remove invalid variable 2014-04-24 01:12:55 +02:00
James Cammarata
16874464e9 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
578ba471b1 Author 2014-04-23 16:53:12 -04:00
James Cammarata
060e2193a1 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
07ad8432ec Ready for pull request 2014-04-23 16:44:49 -04:00
Richard Hoop
5692ae95ab Core complete 2014-04-23 15:26:03 -04:00
James Cammarata
eb090ad4a2 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
24cfcd1f88 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
68d45a6484 Started reconfigured 2014-04-23 09:53:12 -04:00
Ted Timmons
b5895712b3 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
630367ebfc Creation complete 2014-04-22 17:12:23 -04:00
Richard Hoop
3e75e504e0 More config checks and clean up for vm_config settings 2014-04-22 16:20:04 -04:00
Bruce Pennypacker
2be8feebce 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
4cb41de987 Updated and corrected example section 2014-04-22 09:27:26 -04:00
Michael Heca
9ad6511be7 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
b2c5106833 Adding support for purging subnets 2014-04-21 21:42:05 -04:00
Richard Hoop
06c64785fb Large cleanups. Reintegrating all modules together for a guest 2014-04-21 16:38:31 -04:00
CaptTofu
2990db728a Small bug - 'acts' should be 'facts' 2014-04-21 08:06:00 -07:00
Bruce Pennypacker
b57887bafd 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
4271613aa5 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
5dada9403e Adds support for VPC subnets to ELB 2014-04-18 09:59:35 -04:00
Joshua Conner
4defd9a15a 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
10171dc42b docker: send 1.10 params if docker-py is new enough version 2014-04-17 16:05:50 -07:00
James Cammarata
1ef0402f03 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
3948dc2d1d docker.client.APIError has moved to docker.errors.APIError 
see 18d4db09ec
 2014-04-16 23:42:56 +01:00
James Cammarata
a37a84243b Check resource_tags value before using it in ec2_vpc 
Fixes #7024
 2014-04-16 12:21:32 -05:00
evanccopengeo
ac64f3c8cf cleaning up the code a bit more 2014-04-15 18:16:34 -04:00
evanccopengeo
88b30a74d2 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
0ef288dcc8 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
46ea3155c6 Ensure params were set in ec2_vpc before accessing them 
Fixes #6763
 2014-04-14 10:58:07 -05:00
Chris Conway
b9af8ea1d0 Adds version_added property to new attributes in gce and gce_pd. 2014-04-14 08:33:45 -07:00
Michael DeHaan
bc2b4174a5 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
2257a69723 Adds support for attaching persistent disks to GCE instances 2014-04-13 18:38:31 -07:00
Chris Conway
d227330a55 Adds support for creating GCE persistent disks from snapshots 2014-04-13 18:38:31 -07:00
Chris Conway
0b45b1256d Adds support for creating GCE persistent disks from images 2014-04-13 18:38:31 -07:00
Michael J. Schultz
db92301b00 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
71b5a11735 docker: from API 1.10 dns and volumes_from should be passed to start() 2014-04-11 17:08:55 +01:00
Eugene Brevdo
8e32f54223 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
e7b275483c 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
509561f658 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
7c9243eacf Fix version added for new parameters in quantum modules 2014-04-08 10:32:53 -04:00
James Tanner
db90f308ca Fix version_added for login_tenant_name in keystone_user 2014-04-08 10:25:44 -04:00
James Tanner
03f99a57b7 Fix version_added for new params in gce_pd 2014-04-08 10:05:57 -04:00
James Tanner
d37f609e00 Fix version_added for new params in gce_net 2014-04-08 10:03:56 -04:00
James Tanner
387414fe29 Fix version_added for new params in gce_lb 2014-04-08 10:00:30 -04:00
James Tanner
34648426ba Set version_added for snapshot in ec2_vol 2014-04-07 23:10:24 -04:00
Michael DeHaan
dfa8aef408 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
b2701d0d76 Fixes #6780 Update version_added for source_dest_check in ec2 module 2014-04-07 12:44:34 -04:00
James Cammarata
085d9aee72 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
8a98773089 Simplify node matching 2014-04-06 19:17:13 -05:00
Atlas Health
97a7df7644 moved ebs_optimized param out of main request hash 2014-04-06 15:35:22 -07:00
Michael DeHaan
4d2b7d6341 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
55a26fa9ed Shared module docs for remaining rax modules 2014-04-04 13:02:49 -05:00
Matt Martz
e821770505 Allow respecification of a node without requiring node_id 2014-04-04 12:41:57 -05:00
Matt Martz
5eace5f718 Return untouhced servers with exact_count 2014-04-04 12:15:35 -05:00
Ted Timmons
d544eb3e3b 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
2518ec2b86 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
37f096a6bb 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
7b5f89ec7c Use PluginLoader for module docs fragments 2014-04-03 16:52:39 -04:00
Matt Martz
bb6f7a267a Add support for shared module documentation fragments 2014-04-03 16:52:39 -04:00
Atlas Health
2657bbcefa ec2: added ability to set EBS optimized instances 
added version
 2014-04-03 12:38:43 -07:00
Atlas Health
7321e23b31 fixed error related to type being defined as a number 2014-04-03 12:24:05 -07:00
James Tanner
b660062801 Fixes #6454 verify ec2 key fingerprints 2014-04-03 13:53:43 -04:00
Paul Durivage
3763b32f86 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
19437aad0b 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
12022233f4 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
ba4838cde5 Adding wait/wait_timeout parameters to the ec2_key module 
Fixes #6455
 2014-04-01 22:14:35 -05:00
jctanner
6a1dcca4be 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
b4de76373a Use /usr/bin/python instead of /usr/bin/env python 2014-04-01 13:54:37 -05:00