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

830 commits

Author SHA1 Message Date
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
Michael DeHaan
289b359139 Merge pull request #6486 from discordianfish/docker-module-add-running 
Rename present to running, add new present state
 2014-03-28 11:50:21 -04:00
Michael DeHaan
9fa0ec57fb Scrub choices=BOOLEANS from remaining core module references. Correct form in argument_spec is type='dict'. 2014-03-28 11:41:35 -04:00
Michael DeHaan
de5849c89a Merge branch 'ec2_snapshot' of git://github.com/hkariti/ansible into devel 2014-03-28 11:36:31 -04:00
Michael DeHaan
b27c21ca53 Merge pull request #6730 from sivel/rax-cbs-new 
New modules: rax_cbs and rax_cbs_attachments
 2014-03-28 11:28:46 -04:00
Michael DeHaan
f2168f3964 Merge pull request #6419 from willthames/aws-autoscaling-with-token-and-profile 
Improvements to ec2 autoscaling modules
 2014-03-28 11:26:53 -04:00
Michael DeHaan
775a95fb45 Merge pull request #6616 from willthames/ec2_vol_allow_delete 
Allow state=absent for ec2_vol
 2014-03-28 11:24:37 -04:00
Joshua Conner
2d9130fc23 docker: use type instead of manually casting strings to lists 2014-03-28 11:19:48 -04:00
Joshua Conner
15eaa859b0 docker bugfixes: trim whitespace around list param elements, handle list params being coerced to int or long type 2014-03-28 11:19:13 -04:00
Cristian Ciupitu
368e3c8310 Micro-optimization: replace s.find(x)!=-1 with x in s 
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
 2014-03-27 20:35:20 +02:00
Matt Martz
187cb14911 Implement recommendations from #4864 2014-03-27 12:59:08 -05:00
Christopher H. Laco
4b996bc432 Add Rackspace Cloud Block Storage modules 
- Add rax_cbs to create/delete cloud block storage volumes
- Add rax_cbs_attachments to attach/detach volumes from servers
 2014-03-26 14:42:22 -05:00
Matt Martz
88a91acfde Support arbitrary extra args in rax module 
Add extra_create_args and extra_client_args to rax module to support passing
advanced configuration options to client instantiation and server create calls.
 2014-03-26 12:50:44 -05:00
Hagai
dbd18bfe3e Added wait_timeout option 2014-03-26 16:18:25 +02:00
Hagai
e59f4fb85e ec2_snapshot: Add wait' and snapshot_tags' parameters, return more 
info on success
 2014-03-26 16:18:25 +02:00
Ian Pointer
5a5e16776f Adding type int for count (in line with other cloud modules) 2014-03-23 13:51:54 -04:00
willthames
7d24940d74 Allow state=absent for ec2_vol 
Add methods to the module to make it more readable and allow reuse
 2014-03-21 22:10:55 +10:00
Maykel Moya
f967181318 ec2_group: Document group_desc rule param 2014-03-21 08:35:25 +01:00
Michael DeHaan
595689a9ef Update documentation YAML syntax. 2014-03-20 13:22:19 -04:00
Maykel Moya
fb1f1ab842 ec2_group: Add documentation for rules_egress 2014-03-20 17:24:22 +01:00
Maykel Moya
a1b8fb88a1 ec2_group: rules are not a required task argument 2014-03-20 17:24:22 +01:00
Maykel Moya
8bd25ee1a4 ec2_group: Request a fresh group object after creation 
When a group is created, an egress_rule ALLOW ALL to 0.0.0.0/0 is added
automatically but it's not reflected in the object returned by the AWS API
call. After creation we re-read the group for getting an updated object.
 2014-03-20 17:24:22 +01:00
Maykel Moya
ad0ca929b5 ec2_group: Auto create missing groups referenced in rules 
Suppose a pair of groups, A and B, depending on each other. One solution
for breaking the circular dependency at playbook level:

    - declare group A without dependencies
    - declare group B depending on A
    - declare group A depending on B

This patch breaks the dependency at module level. Whenever a depended-on
group is missing it's first created. This approach requires only two tasks:

    - declare group A depending on B (group B will be auto created)
    - declare group B depending on A

When creating a group EC2 requires you to pass the group description. In
order to fullfil this, rules now accept the `group_desc` param. Note
that group description can't be changed once the group is created so
it's nice to keep descriptions in sync.

Concrete example:

- ec2_group:
    name: mysql-client
    description: MySQL Client
    rules_egress:
      - proto: tcp
        from_port: 3306
        to_port: 3306
        group_name: mysql-server
        group_desc: MySQL Server

- ec2_group:
    name: mysql-server
    description: MySQL Server
    rules:
      - proto: tcp
        from_port: 3306
        to_port: 3306
        group_name: mysql-client
 2014-03-20 17:24:17 +01:00
Maykel Moya
3231034b6e ec2_group: Deduplicate rule parsing/validation code 2014-03-20 16:19:35 +01:00
Maykel Moya
0240435459 ec2_group: Add support for handling egress rules 2014-03-20 15:50:08 +01:00
jjshoe
2a80987436 assign_public_ip was actually added in 1.5 
Checked 1.4.5 and this option doesn't exist. Will check/update/pull docs next.
 2014-03-20 09:21:10 -05:00
Oleg Bulatov
e8e42fc500 Respect region_name in nova_compute 
Signed-off-by: Oleg Bulatov <oleg@bulatov.me>
 2014-03-20 17:07:49 +04:00
Michael DeHaan
4888b9266f Merge pull request #6549 from mattjbray/docker-tty-stdin_open-params 
docker: add tty and stdin_open options
 2014-03-19 17:28:12 -04:00
Michael DeHaan
319fceb64d add notes about new AWS modules. 2014-03-19 17:26:59 -04:00
Michael DeHaan
65a84667a2 Merge pull request #6540 from Zeekin/devel 
Add cloud modules ec2_scaling_policy and ec2_metricalarm
 2014-03-19 17:25:44 -04:00
joehack3r
e4842b5df2 Update example to include delete on termination 2014-03-18 15:49:27 -05:00
Matt Bray
a351f40fff docker: add tty and stdin_open options 
Useful for development environments.  Setting these options to true
allows you to `docker attach` to a docker container started with
ansible.
 2014-03-18 11:57:01 +00:00
Zeekin
2afa7c691d Added AWS modules ec2_scaling_policy and ec2_metricalarm for configuring scaling policies for autoscaling groups, and metric alarms. 2014-03-18 10:32:55 +10:00
Zeekin
dba0aa71a9 Improvements to ec2 autoscaling modules 
* Added desired_capacity and vpc_zone_identifier to ec2_asg
* Use ec2_argument_spec() method and then remove unnecessary
  declarations from argument_spec
* Remove AWS_REGIONS declaration
* Rename block_device_mappings to volumes to be consistent with ec2
* Remove all pep8 warnings except line length and continuation indent
* Use updated module_utils/ec2.py to add profile and security_token
  support
* Remove mandatory arguments for delete to make launchconfig deletion
  work
* Handle existing launch configurations better
* Improve output information
* Improve documentation
 2014-03-17 11:33:43 +10:00
Cristian Ciupitu
7f681c33a2 Micro-optimization: replace s.find(x)!=-1 with x in s 
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
 2014-03-16 13:10:28 -04:00
Michael DeHaan
c3e8a51374 Remove nova_fip (redundant merge relative to quantum module) 2014-03-16 12:29:19 -04:00
follower
75ce001230 Fix typo 
"a the" -> "the"
 2014-03-17 00:23:16 +13:00
follower
7b14469f9e Fix typo in example name 2014-03-15 19:16:14 +13:00
tmperret
dbec576633 Made load_balencers in ec2_lc non-required as not all ASGs require an ELB 2014-03-14 22:39:57 +00:00
Michael DeHaan
6b43e6cd50 Add GCE guide and retool a bit to show the add_host interactions, improvements/upgrades are welcome. 
Had to shoot the recently merged nova_group module in the head temporarily as it contained a dict comprehension, which means it can't work on all the platforms
and was also breaking docs builds on CentOS.  Will engage with list about that shortly.
 2014-03-14 15:02:22 -04:00
Michael DeHaan
e9f6496582 Fix docs for ec2_lc module. 2014-03-14 12:01:23 -04:00
Johannes 'fish' Ziemke
459a76c0dd Rename present to running, add new present state 
The new present state just makes sure that a container exists, not that
it's running, although it get started one creation.
This is very useful for data volumes. This also changes the old
present, now running (default) state to only create the container if
it's not found, otherwise it just get started.

See also discussion on mailinglist:
https://groups.google.com/forum/#!topic/ansible-devel/jB84gdhPzLQ

This closes #6395
 2014-03-14 14:28:46 +01:00
Paul Durivage
66fe9c0ac4 Documentation updates 2014-03-13 16:18:50 -05:00
James Cammarata
72217c297d Adding validate_certs to all modules that use fetch_url 2014-03-12 10:19:54 -05:00
Richard Isaacson
4edaa6c617 Merge pull request #6427 from risaacson/migrate_booleans_bool_rax_files_objects 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 23:25:40 -05:00
Richard Isaacson
ba4cd661cf Merge pull request #6426 from risaacson/migrate_booleans_bool_rax_files 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 23:25:30 -05:00
Richard Isaacson
7a7b81e20d Merge pull request #6425 from risaacson/migrate_booleans_bool_rax 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 23:25:25 -05:00
Richard Isaacson
23413641fa Merge pull request #6424 from risaacson/migrate_booleans_bool_quantum_subnet 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 23:25:17 -05:00
Richard Isaacson
dff1a9b8e7 Merge pull request #6423 from risaacson/migrate_booleans_bool_gce 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 23:25:08 -05:00
Richard C Isaacson
6467eb7b6d Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:53:24 -05:00
Richard C Isaacson
2b4c65d956 Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:50:03 -05:00
Richard C Isaacson
07f6d29503 Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:46:53 -05:00
Richard C Isaacson
7b488f0bd8 Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:43:01 -05:00
Richard C Isaacson
c4d8e6abf6 Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:39:42 -05:00
Richard C Isaacson
37b15ab45a Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:36:44 -05:00
jctanner
fed4fa2fcf Merge pull request #6415 from devoncrouse/devel 
Fixed references to missing method in ec2 modules
 2014-03-11 22:37:19 -04:00
James Tanner
21c4378ad5 Fixes #6411 Return None for ec2 api endpoints that return 404 2014-03-11 21:38:00 -04:00
James Tanner
c692d432a6 Remove duplicate digital_ocean_droplet module 2014-03-11 20:59:46 -04:00
Devon Crouse
c4004ae19b Fixed references to missing method in ec2 modules 
Change-Id: I9b89d433b545269d111b3c290b6411aabf58dd24
 2014-03-11 18:19:03 -06:00
Michael DeHaan
367ec22597 Fix ec2_facts module by removing stray fail statement 2014-03-11 19:17:22 -04:00
Michael DeHaan
bc8ebb69bf Merge pull request #6409 from risaacson/migrate_booleans_bool_ec2_eip 
Bulk update of choices=BOOLEANS to type='bool'
 2014-03-11 17:59:05 -05:00
Richard C Isaacson
d944ba409a Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 15:44:34 -05:00
Richard C Isaacson
04c75500a2 Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 15:42:45 -05:00
James Cammarata
69d344986c Merge pull request #5079 from candlerb/candlerb/virt_states 
Additional target states for virt module: "destroyed" and "paused"
 2014-03-11 15:25:09 -05:00
Michael DeHaan
25a14461b0 Merge pull request #6400 from vadimkuznetsov/bug5959 
bug 5959: https://github.com/ansible/ansible/issues/5959
 2014-03-11 15:08:29 -05:00
James Tanner
bcabef32e9 Fix version_added and snippet imports on new digital ocean modules 2014-03-11 15:43:59 -04:00
jctanner
3f6e23028f Merge pull request #4315 from mgregson/add-digital-ocean-domains 
Add digital ocean domains
 2014-03-11 15:40:15 -04:00
James Cammarata
0b9b8abd6e Adding version_added field to metadata field in s3 module 2014-03-11 13:50:21 -05:00
Jake Kreider
72ea1de718 Updated S3 metadata examples 2014-03-11 13:50:21 -05:00
Jake Kreider
689c4fb0d6 Added metadata support to s3 module 2014-03-11 13:50:21 -05:00
Richard C Isaacson
154bfca787 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
edfa3f0d21 Merge pull request #6403 from risaacson/nova_group 
Nova group
 2014-03-11 13:35:02 -05:00
Richard C Isaacson
db3a6ce14c Bump relased in version and update module snippets. 
Closes GH-5069
 2014-03-11 13:33:18 -05:00
Richard Isaacson
d2e0eb0581 Merge pull request #6402 from risaacson/nova-fip 
Nova fip
 2014-03-11 13:29:01 -05:00
Richard C Isaacson
c01fbc0a31 Bump relased in version and update module snippets. 
Closes GH-5154
 2014-03-11 13:25:16 -05:00
Vadim Kuznetsov
afa79f5440 bug 5959: https://github.com/ansible/ansible/issues/5959 2014-03-11 13:41:50 -04:00
James Cammarata
d45ee5a3d8 Fixing up some docstrings causing make webdocs to fail 2014-03-11 12:29:02 -05:00
Alexander Popov
007809b0fc Added 'version_added' to the 'resrouce_tags' attribute in DOCUMENTATION section. 2014-03-11 13:27:03 -04:00
Alexander Popov
ee6079d5e9 Added code to create tags on the VPC resource 2014-03-11 13:27:02 -04:00
Alexander Popov
2de088a325 Updated module documentation, re: resource_tags 2014-03-11 13:27:02 -04:00
Alexander Popov
ef6ba74156 Renamed vpc_id_tags to resource_tags 2014-03-11 13:27:02 -04:00
Alexander Popov
b4a9748faa Added multi VPC support 
Initial commit

Refactored terminate_vpc method to support vpc_id_tags

Cleaned up find_vpc() method
 2014-03-11 13:27:02 -04:00
James Tanner
1deff2061a Update docstring in digital_ocean for backups_enabled version_added 2014-03-11 12:17:29 -04:00
jctanner
ba04c99517 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
4ba9cc0c80 Update docstrings in ec2_ami_search 2014-03-11 12:14:14 -04:00
James Cammarata
222b999403 Merge branch 'silkapp-ec2-eip-reuse' into devel 2014-03-11 11:13:01 -05:00
James Cammarata
325e1c7a93 Renaming reuse parameter in ec2_eip and adding a version_added string 2014-03-11 11:12:23 -05:00
jctanner
8e8e9b3c7e Merge pull request #4845 from lorin/ec2_ubuntu_ami 
New module: ec2_ami_search
 2014-03-11 12:11:49 -04:00
James Cammarata
79758c9814 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
e7ea748f0f Update docstrings in ec2_vol 2014-03-11 12:02:04 -04:00
James Cammarata
d319e8be30 Merge branch 'josephtate-devel' into devel 2014-03-11 11:00:40 -05:00
jctanner
3945dab508 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
0ddc094b8f 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
04ebfc2026 Merge pull request #5454 from claco/rax_identity 
Add rax_identity module
 2014-03-11 11:51:30 -04:00
James Cammarata
0b85dc6d53 Merge branch 'willthames-ec2_security_token' into devel 2014-03-11 10:48:52 -05:00
jctanner
5d31c497f0 Merge pull request #5703 from ethercrow/fakes3 
[s3] Compatibility with fakes3.
 2014-03-11 11:48:21 -04:00
James Cammarata
789a2915d1 Updating profile/security_token version_added labels 2014-03-11 10:48:16 -05:00
Michael DeHaan
7e4793e808 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
d0495f5528 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
9accca4b47 Set version-added for new parameters in ec2_elb_lb and elasticache 2014-03-11 11:44:47 -04:00
Michael DeHaan
20fced7e44 Merge pull request #5997 from jonasi/elasticache_vpc_security_groups 
Elasticache vpc security groups
 2014-03-11 10:42:13 -05:00
Michael DeHaan
5c50deb39d 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
9895c1b0eb 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
c9e5047abe Update version_added for wait_timeout parameter on elb module. 2014-03-11 11:22:17 -04:00