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
10026 commits 10 branches 167 tags 272 MiB
Commit graph

695 commits

Author SHA1 Message Date
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
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
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
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
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
Federico Feroldi
b9ab31ebd8 Fix for #6365: cloudformation module fails to update if stack exists 2014-03-10 13:11:09 +01:00
Markus Amalthea Magnuson
3f681ebc52 Touch up documentation strings for DigitalOcean. 2014-03-08 12:40:45 +01:00
Scott Anderson
db67c3d772 Fixes a bug that prevents round-tripping of * and @ 2014-03-06 19:10:56 -05:00
James Cammarata
5a235f9e99 Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue 
Adding a wait loop to ec2_elb for the initial lb state when registering
 2014-03-06 14:01:11 -06:00
willthames
4a093a9709 Make it easier to determine whether instance creation or tagging fails 2014-03-06 16:30:39 +10:00
Will Thames
b9a7352e0a Work to allow security tokens and profiles to work with Ansible 
Allow security tokens and profiles to be used as arguments
to the 'common' ec2 modules

Mostly refactoring to provide two new methods,
`get_aws_connection_info`, which results in a dict that can be
passed through to the boto `connect_to_region` calls, and
`connect_to_aws` that can pass that dict through to the
`connect_to_region` method of the appropriate module.

Tidied up some variable names

Works around boto/boto#2100

profiles don't work with boto < 2.24, but this detects for that
and fails with an appropriate message. It is designed to work
if profile is not passed but boto < 2.24 is installed.

Modifications to allow empty aws auth variables to be passed
(this is useful if wanting to have the keys as an optional
parameter in ec2 calls - if set, use this value, if not set,
use boto config or env variables)

Reworked validate_certs improvements to work with refactoring

Added documentation for profile and security_token to affected modules
 2014-03-06 16:28:30 +10:00
Alexander Popov
e56cffe3a5 Renamed instance_tags to resource_tags based on community feedback. 2014-03-05 10:11:55 -05:00
Alexander Popov
3c4b14523b Renamed subnet's 'tags' attribute into 'instance_tags' to distinguish it from Ansible's own 'tags' and to conform to ec2 module naming for AWS tags. 2014-03-05 10:11:55 -05:00
Alexander Popov
428c69c08a Refactored subnet tagging to account for AWS delays; added 'tags' attribute to 'subnet' node in the returned json. 2014-03-05 10:11:55 -05:00
Alexander Popov
4dbac647bc Added documentation for subnets: tags: option 2014-03-05 10:11:55 -05:00
Alexander Popov
2a108b2aeb Added subnet tagging. 2014-03-05 10:11:55 -05:00
jctanner
40ee030790 Merge pull request #6265 from franckcuny/gce-fixes 
Add credential parameters to the GCE modules.
 2014-03-05 00:11:52 -05:00
Franck Cuny
6294264dc4 Add credential parameters to the GCE modules. 
In order to simplify the workflow with the GCE modules, it's now
possible to add the parameters and project name as arguments to the
various GCE modules.

The inventory plugin also returns the IP of the host in
`ansible_ssh_host` so that you don't have to specify IPs into the
inventory file.

Some update to the documentation are also added.

Closes #5583.
 2014-03-04 19:27:49 -08:00
Michael Scherer
5fd7b8010f Fix wrong module name for exception in nova compute 
failed: [127.0.0.1] => {"failed": true, "parsed": false}
  invalid output was: Traceback (most recent call last):
    File "/tmp/ansible-tmp-1393950384.39-102240090845592/nova_compute", line 1328, in <module>
      main()
    File "/tmp/ansible-tmp-1393950384.39-102240090845592/nova_compute", line 241, in main
      except exc.Unauthorized, e:
  NameError: global name 'exc' is not defined
 2014-03-04 17:30:15 +01:00
Jim Kytola
186d19f224 Removes pluralization of manager tag attribute. 2014-03-04 10:07:32 -05:00
willthames
f568140ea5 Allow ec2_tag module to list the tags of an instance 
Use the list argument to state to just collect the
tags of a resource through the AWS API.
 2014-03-04 23:36:17 +10:00
Quinn Slack
635fdcb533 Add new cloud/rds DB instance types (db.m3 and db.cr1 families) 2014-03-03 19:59:27 -08:00
Joshua Conner
10f36e8c62 nova_compute: remove ternary statement 2014-03-03 10:55:28 -08:00
jctanner
b1a3e367b6 Merge pull request #6196 from softzilla/feature/docker_py_0.3.0_ansible 
docker_image: added support for docker_py >= 0.3.0, Docker API >= 1.8. Replace #6178
 2014-03-03 11:58:16 -05:00
James Cammarata
7f1989dc9c Adding a wait loop to ec2_elb for the initial lb state when registering 
Fixes #5305
 2014-03-03 10:12:03 -06:00
Scott Anderson
5c9739ae9c Adds modules for managing Amazon RDS parameter and subnet groups. 2014-03-02 19:36:07 -05:00
Gareth Rushgrove
a26bc3e2f9 correct name in documentation and example 2014-03-02 12:00:50 +00:00
Gareth Rushgrove
87265cd4b3 correct version added 2014-03-02 11:58:22 +00:00
Gareth Rushgrove
c770462fad Added modules to manage ec2 autoscaling groups 
Includes management of Launch Configuration and related Autoscaling
Groups
 2014-03-01 16:06:19 +00:00
Joshua Conner
ce5939c507 nova_compute: fix for partial match b/w params['name'] and an existing name 
When there is an Openstack instance that has a name that's a partial match
for module.params['name'], but a server with name module.params['name']
doesn't yet exist, this module would fail with a list index out of bounds
error. This fixes that by filtering by exact name and only then getting the
server from the list if the list is still not empty.
 2014-02-28 18:05:52 -08:00
Eugene Brevdo
fa3d84d59e Tiny bugfix in ec2_vol documentation. 2014-02-28 11:56:42 -08:00
Michael DeHaan
bbb88517ef Since the ec2 parameter is named 'key_name' and 'keypair' is just an alias, use 
the primary name of the parameter in the examples.
 2014-02-28 13:52:47 -05:00
jctanner
42a2586dfa Merge pull request #6171 from joshuaconner/update_to_docker-py_0.3.0 
docker: update to docker-py 0.3.0, plus full port binding support etc. from #5639
 2014-02-28 08:31:56 -05:00
Richard Isaacson
73fa767a6b Added instance_tenancy functionality per social request. 2014-02-27 09:29:00 -06:00
James Cammarata
3274785350 Merge pull request #5689 from pgehres/devel 
Adding the region to the output of the ec2 module's creation of a new in...
 2014-02-26 14:45:12 -06:00
Pavel Antonov
21a7bace77 Support docker_py >= 0.3.0, Docker API >= 1.8, extended error reporting 2014-02-27 00:27:39 +04:00
James Cammarata
bb5da4c5f6 Merge branch 'devel' of https://github.com/josephtate/ansible into josephtate-devel 
Conflicts:
	library/cloud/ec2
 2014-02-26 13:57:07 -06:00
James Cammarata
d6b912c429 Modifying the wait logic for newly created images to avoid tracebacks 
Fixes #4619
 2014-02-26 13:33:31 -06:00
James Cammarata
8a7c68dc18 Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params 
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
 2014-02-26 09:37:26 -06:00
Patryk Zawadzki
da1efee21f Properly match existing security group 
If we don't care about `vpc_id` then neither should the code.
 2014-02-26 13:39:03 +01:00
jctanner
6fa898c511 Merge pull request #5092 from willthames/ec2_snapshot 
Module to create EC2 snapshots
 2014-02-26 06:10:17 -05:00
jctanner
1277b45b3c Merge pull request #5941 from sivel/rax-name-search-opts 
rax module: Use regex start and end of string with name base filters
 2014-02-26 05:56:39 -05:00
Joshua Conner
9c72b52c01 docker: add 'version_added' to the appropriate documentation entries 2014-02-25 17:04:01 -08:00
Joshua Conner
66eb91c2f8 docker: update to docker-py 0.3.0, plus full port binding support, container names, links 2014-02-25 15:24:46 -08:00
Scott Patten
dbde446358 In the route53 module, documenting that TXT and SPF requests 
must be surrounded by quotes.

Otherwise you get a cryptic error message from Route 53.
 2014-02-21 19:36:22 -08:00
Gianluca Borello
bf79833c9d Make sure droplet deletion works even when idempotency is achieved using 'name' and 'unique_name' rather than 'id' 2014-02-20 22:17:55 -08:00
James Laska
dbd3194e9c Resolves issue#6067 by allowing exact_count=0 2014-02-19 16:29:15 -05:00
James Cammarata
9dd9487692 Merge branch 'mohangk-fix_rds_modify_security_group' into devel 2014-02-15 09:34:46 -06:00
James Cammarata
7eb2a4c290 Merge branch 'fix_rds_modify_security_group' of https://github.com/mohangk/ansible into mohangk-fix_rds_modify_security_group 2014-02-14 14:43:42 -06:00
Bruce Pennypacker
899811f339 Added wait_timeout parameter 2014-02-14 20:16:58 +00:00
Richard Isaacson
bab91f9ed8 Merge pull request #6015 from angstwad/docfix 
Spelling correction.
 2014-02-14 11:04:44 -06:00
Paul Durivage
0dbd5d3e18 Spelling correction 2014-02-14 10:47:27 -06:00
Amir H. Hajizamani
cf5b1620b7 Remove superfluous/invalid quote 
Allow the example to be copy-pasted with minimal confusion about the error.
 2014-02-14 16:44:55 +00:00
Peter Gehres
b5761750c4 Adding the region to the output of the ec2 module's creation of a new instance. 2014-02-13 22:40:49 -08:00
James Cammarata
fdb7c733c1 Updating CHANGELOG for the new validate_certs feature 
Also removing validate_cert option from the cloudformation module docs,
as it does not use the standard ec2 connection.
 2014-02-13 14:40:39 -06:00
James Cammarata
056d54ebd3 Adding 'validate_certs' option to EC2 modules 
When disabled, the boto connection will be instantiated without validating
the SSL certificate from the target endpoint. This allows the modules to connect
to Eucalyptus instances running with self-signed certs without errors.

Fixes #3978
 2014-02-13 12:32:49 -06:00
Isao Jonas
6f44e7b039 add security groups to elb_lb 2014-02-13 10:57:41 -06:00
Will Thames
c8127ea874 ec2 module fails when state is not absent 
tagged_instances is initialised in a scope not visible
when state is not absent.
 2014-02-13 19:51:33 +10:00
Pavel Antonov
e02cf2aab7 Refactore unused code 2014-02-12 17:06:58 -05:00
Pavel Antonov
dddd4b2522 Added modules description and examples 2014-02-12 17:06:58 -05:00
Pavel Antonov
df41ed90b8 Docker supports links and port binding. Added docker_image module 2014-02-12 17:06:58 -05:00
Michael DeHaan
0cdf8d3162 Merge pull request #5981 from angstwad/docfix 
Documentation updates to rax_files, rax_files_objects
 2014-02-12 14:21:10 -05:00
James Cammarata
a1b7a93b69 Modified cloudformation module to use common ec2 module functions 
Fixes #3688
 2014-02-12 12:54:47 -06:00
Paul Durivage
f18db0dd20 Doc updates 2014-02-12 11:22:15 -06:00
Isao Jonas
1602a80d76 added elasticache vpc security group ids 2014-02-12 09:06:15 -06:00
Michael DeHaan
f07091ed69 Merge pull request #5962 from sivel/rax-facts-docs-update 
rax_facts and rax_keypair modules: update docs
 2014-02-11 16:39:59 -05:00
Matt Martz
e8952a5a99 The OpenStack auth attributes apply to rax_keypair also 2014-02-11 14:25:13 -06:00
jctanner
fe94c0cd05 Merge pull request #5957 from sivel/rax-no-default-disk-config 
rax module: Don't set a default for disk_config
 2014-02-11 11:55:06 -05:00
Christopher H. Laco
471b1a7a47 Add rax_identity module 
For some tasks, I need to drop the username/api_key into configuration
files. Rather than rely on how I'm calling the rax modules. It seemed
more appropriate to authenticate against Rackspace and return the wealth
of information contained in the pyrax identity payload with other
modules/templates.
 2014-02-10 22:40:38 -05:00
Matt Martz
8095aa6584 Don't set a default disk_config. Defaulting to 'auto', causes issues with new images 2014-02-10 16:12:32 -06:00
Matt Martz
bd3c7c3efa The name parameter for search_opts is a regex string, so make sure we include start and end of string characters 2014-02-10 13:18:03 -06:00
zimbatm
4aaf8f9a4c library/digital_ocean: Adds the missing backups_enabled create option 2014-02-10 17:35:10 +00:00
Mohan Krishnan
fb3c8c90e5 Allow explict setting of vpc_security_groups to allow modification of security groups of RDS instances within a VPC 2014-02-10 14:01:45 +07:00
Michael DeHaan
d3c1b8de78 Merge pull request #5883 from amirhhz/improve-ec2-module-docs 
Improve ec2 module docs
 2014-02-09 14:07:35 -05:00
Scott Anderson
baf508a379 Change standard AWS access and secret key parameter names to aws_access_key and aws_secret_key. Fixes an authentication problem with the rds module and standardizes the naming convention on something more encompassing than ec2_*_key. 2014-02-08 18:35:26 -05:00
Matt Saunders
674969a7d8 Added user_data parameter to nova_compute module - currently no file parsing just text - Re issue #4992 2014-02-08 22:47:03 +00:00
Jon Chen
970997c764 fix linode typo 2014-02-07 20:47:57 -05:00
James Tanner
a62af82757 Make ec2 exact_count and count mutually exclusive 2014-02-07 13:42:43 -05:00
James Tanner
70ebb05190 Return a tagged_instances list for hosts that matched the count_tag 2014-02-07 13:07:34 -05:00
James Tanner
f101768a9d Make an example that sets the instance Names 2014-02-07 10:49:13 -05:00
James Tanner
005ef837d9 Update docstrings 2014-02-07 10:34:45 -05:00
James Tanner
fd919062cb Add exact_count and count_tag to the ec2 module. 2014-02-06 23:25:57 -05:00
Will Thames
7600c664fe Create a common EC2 connection argument spec for EC2 modules 
Refactor the currently well-factored ec2 modules (i.e. those that already use ec2_connect) to
have a common argument spec. The idea is that new modules can use this spec without duplication
of code, and that new functionality can be added to the ec2 connection code (e.g. security
token argument)
 2014-02-06 15:27:41 +10:00
willthames
27fc3b8006 Module to create EC2 snapshots 
Two methods of creating a snapshot
* use volume_id
* use device_name and instance_id

The latter is more useful with inventory
 2014-02-06 09:44:43 +10:00
jctanner
7fcf6cebfe Merge pull request #5881 from willthames/ec2_keys 
Minor tweaks to simplify examples and documentation
 2014-02-05 15:50:19 -05:00
jctanner
c13161993a Merge pull request #5410 from willthames/rds_snapshot 
rds module: add snapshot capabilities
 2014-02-05 15:23:08 -05:00
Amir H. Hajizamani
843f4e7d7c Neaten up example YAML with 2-space indenting 2014-02-05 15:14:44 +00:00
Amir H. Hajizamani
7c38e8a225 Example should put instance_ids list in quotes for avoid YAML error 2014-02-05 15:12:41 +00:00
Amir H. Hajizamani
b0bc2bd86a Fix missing quote mark in route53 doc example 2014-02-05 13:59:31 +00:00
willthames
e0c245f1ae Minor tweaks to simplify examples and documentation 
Made a few things more consistent with the bulk of the other EC2
modules and removed an unnecessary check that is handled by
AnsibleModule
 2014-02-05 22:25:44 +10:00
jctanner
a877b8b030 Merge pull request #5624 from mattsoftware/route53_ttl 
Enable changes to ttl of a record to be propogated to route53
 2014-02-04 11:11:44 -08:00
Timur Batyrshin
658c15930e reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 2014-02-03 13:00:40 -06:00
Eugene Brevdo
553b42516e ec2_vol supports name / id to mount volume on instance 
* volume_size no longer required if name/id are provided
* id is volume-id
* name is volume Name tag
* special checking is provided
 2014-01-30 10:27:40 -08:00
Matt Martz
7498f212fc Update docs for rax_facts to include parameters added for other OpenStack clouds 2014-01-30 07:59:31 -07:00
jctanner
086cf0acb7 Merge pull request #5745 from angstwad/cf-module-revert 
Add Rackspace Cloud Files module
 2014-01-29 17:01:57 -08:00
jctanner
434c78f263 Merge pull request #5744 from angstwad/revert 
Add Rackspace Cloud Files containers module
 2014-01-29 16:36:42 -08:00
jctanner
203a66eb48 Merge pull request #4865 from claco/rax_queue 
Add rax_queue module to create/delete Rackspace Cloud Queues
 2014-01-29 16:28:43 -08:00
jctanner
360f06b41d Merge pull request #5806 from sivel/rax-mod-utils-improvements 
Rax mod utils improvements
 2014-01-29 16:17:06 -08:00
jctanner
6c1f75c688 Merge pull request #5132 from sivel/rax-keypair 
Add rax_keypair module
 2014-01-29 16:15:29 -08:00
jctanner
6265128c9e Merge pull request #4941 from sivel/rax-clb-shared-vip 
Add ability to specify a VirtualIP ID for sharing a VIP with another LB
 2014-01-29 16:14:29 -08:00
Michael DeHaan
83f43b82ad ansible -> ansibleworks 2014-01-28 20:29:41 -05:00
Matt Martz
07c76d7ec9 Update rax module DOCUMENTATION with new auth options 2014-01-28 13:59:49 -06:00
James Tanner
1584d8f01b Add ec2_vol snapshot example from #4189 2014-01-28 09:58:13 -05:00
jctanner
fca8ec3d3c Merge pull request #4508 from willthames/ec2_vol_snapshot 
Added ability to create EC2 volume from snapshot
 2014-01-28 06:22:14 -08:00
James Tanner
5cbe24913f Fix start/stop example in ec2 2014-01-27 17:48:42 -05:00
James Tanner
1641361057 Merge branch 'feat/ec2_start_stop' of git://github.com/Geryon/ansible into Geryon-feat/ec2_start_stop 2014-01-27 17:39:24 -05:00
jctanner
b8d3c0f865 Merge pull request #5506 from mohangk/fix_elb_register_new_instance 
Fix exception being thrown for new instance registration with ELB
 2014-01-27 12:19:44 -08:00
jctanner
821858ed08 Merge pull request #5380 from dhml/devel 
ec2_group: rules can't reference containing group fix #5309
 2014-01-27 11:41:21 -08:00
Mohan Krishnan
0f95961e33 Fix exception being thrown for new instance 
Currently if we are trying to register an instance that has not yet
been registered with the elb an exception is thrown.
 2014-01-27 20:18:55 +07:00
willthames
de659af82b Added the ability to add volumes to instances at creation time 
This allows a volume to be cloned from a snapshot, a brand new
volume to be created, or an ephemeral volumes to be associated
at time of instance creation.

This avoids any race conditions associated with creating extra volumes
after instance creation (e.g. writes happening before the volume is
mounted).

In addition, this allows the root volume to be edited
 2014-01-25 12:38:41 +10:00
James Tanner
17f0c9e477 Refactor ec2_elb_lb to use shared module snippet code 2014-01-24 15:33:41 -05:00
James Tanner
512c02b7d2 Fix missing description key 2014-01-24 15:13:01 -05:00
James Tanner
53b7a495ca Merge branch 'add_ec2_elb_lb_module' of git://github.com/jsdalton/ansible into jsdalton-add_ec2_elb_lb_module 2014-01-24 15:11:54 -05:00
Christopher H. Laco
745a480e5c Add rax_queue module to create/delete Rackspace Cloud Queues 2014-01-24 11:14:25 -05:00
Paul Durivage
2090e75e12 Use dict constructors 2014-01-23 22:05:46 -06:00
Paul Durivage
d8bf5033ec Fix revert artifacts, doc update 2014-01-23 22:05:36 -06:00
James Tanner
4b80156267 Standardize some parameters in ec2_key 2014-01-23 22:22:09 -05:00
jctanner
cbb2a4ce9b Merge pull request #5256 from zbal/ec2_keys 
Add ec2_key module.
 2014-01-23 19:14:46 -08:00
Paul Durivage
b24474ae58 Remove dict comprehension; use dict constructor 2014-01-23 21:05:52 -06:00
Paul Durivage
0a0ed538b2 Resolve revert conflicts 2014-01-23 20:43:31 -06:00
Paul Durivage
0cabb2fcc4 Imperfect revert w/ artifacts. 
Revert "Revert "Merge pull request #5540 from angstwad/cf-container-module""

This reverts commit c3408f205e.

Conflicts:
	library/cloud/rax_files
 2014-01-23 20:31:44 -06:00
Paul Durivage
95a436980a Doc updates; fix YAML problems 2014-01-23 19:19:35 -06:00
jctanner
3c455685bc Merge pull request #5603 from willthames/ec2_keypair_not_mandatory 
key_name is not required when creating ec2 instances
 2014-01-23 17:06:23 -08:00
Paul Durivage
48b09d85b4 Revert "Revert "Merge pull request #5496 from angstwad/cf-module"" 
This reverts commit b11d62270f.

Conflicts:
	library/cloud/rax_files_objects
 2014-01-23 18:57:22 -06:00
Paul Durivage
d298d3bfb4 Update documentation; fix YAML problems 2014-01-23 18:56:00 -06:00
James Tanner
b11d62270f Revert "Merge pull request #5496 from angstwad/cf-module" 
This reverts commit a807e3b9c8, reversing
changes made to df8ecdeded.
 2014-01-23 18:27:49 -05:00
James Tanner
c3408f205e Revert "Merge pull request #5540 from angstwad/cf-container-module" 
This reverts commit bedc616f74, reversing
changes made to a807e3b9c8.
 2014-01-23 18:27:33 -05:00
James Tanner
bec35cc0c1 Revert "Fix docstrings in rax_files_objects" 
This reverts commit e759832dd6.
 2014-01-23 18:27:22 -05:00
James Tanner
e759832dd6 Fix docstrings in rax_files_objects 2014-01-23 18:10:17 -05:00
jctanner
bedc616f74 Merge pull request #5540 from angstwad/cf-container-module 
Add module support for Rackspace Cloud Files Containers
 2014-01-23 14:46:11 -08:00
jctanner
a807e3b9c8 Merge pull request #5496 from angstwad/cf-module 
Module support for Rackspace Cloud Files
 2014-01-23 14:26:40 -08:00