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

1267 commits

Author SHA1 Message Date
Brian Coca
d564569910 update to use connect_to_region to avoid errors with china 2014-12-17 19:55:54 -05:00
Brian Coca
8e5a849c66 Merge pull request #3 from atlashealth/ec2_vol_ssd_ebs 
Ability to specify new SSD EBS option
 2014-12-17 19:08:41 -05:00
Brian Coca
3ee8e2840f Merge pull request #6 from willthames/ec2_snapshot_remove 
Added the ability to remove snapshots
 2014-12-17 17:28:47 -05:00
Brian Coca
978204aaa2 Merge pull request #496 from haraldsk/devel 
add support for stack policies in cloudformation
 2014-12-17 16:46:56 -05:00
Kale Franz
73172fae47 #531 correction 
correct list comprehension for older versions of python (back to python 2.4)
 2014-12-17 09:01:50 -08:00
Kale Franz
e174c9b474 fixes #529 ec2_group module bug 2014-12-17 03:34:47 -08:00
Toshio Kuratomi
c853bb5a0f Merge pull request #518 from likwid/devel 
Fixed formatting in cloudformation example
 2014-12-16 23:18:01 -08:00
Richard Lander
73e32db22f password required 2014-12-16 17:28:12 -05:00
Toshio Kuratomi
51ed13b887 Fix documentation build 2014-12-16 11:50:41 -08:00
Brian Coca
4cfc8d6950 Merge pull request #72 from stewrutledge/vmtemplate 
Added support for deploying virtual machine from a virtual template
 2014-12-15 20:01:54 -05:00
Richard Lander
0ab3b30b2f set network_config.public_ips attribute 2014-12-15 16:26:33 -05:00
Jeff Gonzalez
369eeb2666 Fixed formatting in documentation 
The example was using mixed shorthand and long form yaml (region: "us-east-1 disable_rollback=true"

I modified the entire example to be long form.
 2014-12-15 10:18:31 -06:00
Mike Putnam
5c6f375c17 Type fix on delete_snapshot docs. 2014-12-12 13:29:51 -06:00
Toshio Kuratomi
f4625a3dd1 Fixup the directory name at a higher level so it can be used by both conditional branches 
Fixes #500
 2014-12-12 11:23:17 -08:00
Matt Martz
7a6a30abbe Merge pull request #492 from sivel/rax-asg-improvements 
Make a few enhancements to the rax_scaling_group module
 2014-12-11 12:59:16 -06:00
Matt Martz
9eb2bff946 Make a few enhancements to the rax_scaling_group module 
* Cast loadbalancer id and port to integers
* Do not attempt to base64 encode NoneType values
 2014-12-11 12:58:12 -06:00
Harri Hämäläinen
b354423bae Fixed typo in comment 2014-12-11 18:59:42 +02:00
Harald Skoglund
5bc8d5b96e add support for stack policies in cloudformation 2014-12-11 16:41:25 +01:00
PikachuEXE
6ce7e63c5f ~ Add missing documentation for option email 2014-12-10 10:23:59 +08:00
Mike Putnam
55a51f4ca9 Clarify possible variable value in the docs. 2014-12-09 10:09:05 -06:00
Michael DeHaan
95aa8481b2 Merge pull request #466 from marcus-ahle/devel 
Preventing Nonetype is not iterable error when no tags are set for new ASG
 2014-12-08 14:26:16 -08:00
Marcus Ahle
ba5c36ce5a Preventing Nonetype is not iterable error when no tags are passed in for a newly created ASG 2014-12-08 12:55:27 -05:00
Ben Whaley
cf24e7d56c vpc_zone_identifier should be a list as per the docs 2014-12-05 18:04:16 -08:00
Scott Miller
53afd359f6 fix documentation 
AWS does not recognize the subnet if it is presented in a comma delimited format with spaces. you must remove the space for Amazon to recognize the second subnet.
 2014-12-03 11:45:42 -05:00
Toshio Kuratomi
5af4463823 Gixes to doc formatting 2014-12-03 08:17:15 -08:00
Brian Coca
71224c8678 Merge pull request #420 from drfickle/route53_float_fix 
route53 module retry_interval needs to be a float before passing to time.sleep
 2014-12-03 11:10:32 -05:00
Francois Deppierraz
f69a7553f7 Fix auto_floating_ip documentation 
The default value is 'no' instead of the currently documented 'yes'.

See cloud/openstack/nova_compute.py line 543:

        auto_floating_ip                = dict(default=False, type='bool'),
 2014-12-03 16:06:50 +01:00
willthames
b287e7c0a6 Added the ability to remove snapshots 
Added state option, and accompanying snapshot_id option for
when state=absent.
 2014-12-02 11:18:53 +10:00
Will Thames
565fa9a0ae Fixed tagging 2014-12-02 11:12:40 +10:00
Denver Janke
0edb9f51e8 Fix few bugs around renaming db instances. 2014-12-02 11:11:30 +10:00
Will Thames
a1a6201b82 Improved error handling 
More tests, particular for failure testing
 2014-12-02 11:11:30 +10:00
Will Thames
7a8586c53c RDS rewrite to use boto.rds and boto.rds2 
Using rds2 allows tags and the control over whether or not DBs are
publicly accessible.
Move RDS towards a pair of interfaces implementing the details of rds
and rds2
Added tests to ensure that all operations work correctly as well as
requirements files that allow virtualenvs to test either boto.rds or
boto.rds2
 2014-12-02 11:11:30 +10:00
Steve Fox
c03ec202a7 retry_interval needs to be a float before passing to time.sleep 2014-12-01 14:21:52 -06:00
Michael DeHaan
9de0045d00 Remove potentially out of date or specific product references. 2014-12-01 15:16:22 -05:00
Michael DeHaan
e7c92a6bc6 More EC2 doc tweaks 2014-12-01 15:14:57 -05:00
Michael DeHaan
c6b0d469ac Misc EC2 doc tweaks. 2014-12-01 14:46:07 -05:00
Philip Misiowiec
59701feadb added version 2014-12-01 10:55:22 -08:00
Philip Misiowiec
f5789e8eda Support for EC2 dedicated tenancy option 2014-12-01 10:55:22 -08:00
Philip Misiowiec
c241e9dd9c added version 2014-12-01 10:52:22 -08:00
Philip Misiowiec
b37a2328c0 Ability to specify new SSD EBS option 2014-12-01 10:52:22 -08:00
follower
a6e0d9d613 Fix typo of "rules_egress" 
Or is "rules_egree" supposed to be a plural? The sentence is difficult to parse.

Maybe the correct fix is to "Purge existing rules on security group that are not found in rules_egress"?
 2014-11-29 18:05:22 +13:00
Will Thames
30c7f9a7d3 Added better region handling and enabled eu-central-1 
Make use of improved connect_to_aws that throws an exception
if a region can't be connected to (e.g. eu-central-1 requires
boto 2.34 onwards)

Add eu-central-1 to the two modules that hardcode their regions
Add us-gov-west-1 to ec2_ami_search to match documentation!
This pull request makes use of the changes in ansible/ansible#9419
 2014-11-22 11:35:46 +10:00
IndyMichaelB
5a628aacd4 docfix for vsphere_guest.py 
Corrected parameter name from user to username in documentation
 2014-11-16 16:59:57 -05:00
Sam Kottler
7b875dbda5 Remove trailing whitespace in digital_ocean_domain 2014-11-15 16:21:07 -05:00
Nejc Zupan
6f6eca5b4e digital ocean: Remove unsupported states 2014-11-15 16:12:46 -05:00
Toshio Kuratomi
c6522620c5 Clean up the docker module just a little so that we can unittest the get_split_image_tag function 2014-11-14 08:46:32 -08:00
Robert Estelle
4dd099fe7a Remove incorrect executable permissions. 2014-11-13 18:08:48 -05:00
Adam Miller
01db13e3ad fix gce_net add firewall rule example 2014-11-13 15:27:10 -06:00
Stewart Rutledge
6d79518d67 Fixed a typo on power options 2014-11-13 22:01:26 +01:00
sterutkb
1dd20197b1 Added support for deploying virtual machine from a virtual template 2014-11-13 22:00:57 +01:00
John Batty
08b2752080 Fix get_flavor_id() when flavor_ram is specified 
Without this fix, _get_flavor_id() fails to find a matching flavor if
both:
* the flavor_ram parameter is specified
* the first flavor in the list does not match.

The bug is simply that the module.fail_json() call lies within the loop
iterating through the flavors.  This call should only be made if the
loop completes and no matching flavors have been found.
 2014-11-13 13:26:20 +00:00
Brian Coca
3a967c8005 Merge pull request #290 from ctrlaltdel/devel 
Fix a typo in nova_compute documentation string
 2014-11-12 16:33:57 -05:00
Brian Coca
1622e3b2df Merge pull request #284 from borgified/devel 
typo in comments: of -> or
 2014-11-12 16:33:20 -05:00
James Cammarata
a7749a8fce Merge pull request #309 from jsmartin/asg_fix_delete 
asg will now be terminated if state=absent.
 2014-11-12 13:16:49 -06:00
James Martin
341c7ce307 asg will now be terminated if state=absent. 
adds mutually exclusive options
 2014-11-12 12:44:03 -05:00
James Cammarata
710b7b9aba Merge pull request #308 from jsmartin/asg_orphaned_code 
Removes orphaned code.
 2014-11-12 11:16:06 -06:00
James Cammarata
ae744f98d8 Serialize tag attributes to ASG properties in ec2_asg 
Fixes #108
 2014-11-12 11:04:43 -06:00
James Martin
d5326e6dbd Removes orphaned code. 2014-11-12 11:48:06 -05:00
James Martin
f287600e6c fixes #240, #274, #108 2014-11-11 19:47:34 -05:00
José Moreira
03cf57c6f0 Fixed small typo on ec2 task name 2014-11-10 11:24:31 +00:00
Francois Deppierraz
2dee52616d Fix a typo in nova_compute documentation string 
Without this patch, ansible-doc was failing this way:

$ ansible-doc nova_compute
Traceback (most recent call last):
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 324, in <module>
    main()
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 316, in main
    text += get_man_text(doc)
  File "/home/francois/WORK/dev/ansible/bin/ansible-doc", line 112, in get_man_text
    desc = " ".join(opt['description'])
KeyError: 'description'
 2014-11-10 09:30:29 +01:00
Fwiffo
6cb8a5f312 typo in comments: of -> or 2014-11-07 15:20:49 -08:00
Michael DeHaan
2970b339eb Deprecate docker_image, use the docker module to deploy docker images, or shell out to docker to call 
docker build if you want from a playbook.
 2014-11-05 16:13:55 -05:00
Brian Coca
19ed60196c added __init__.py to new cloud subcategories so builds work again 2014-11-05 11:07:19 -05:00
Brian Coca
0c4adcb2c6 made subcategories for cloud modules for better organization 2014-11-04 11:18:09 -05:00
James Cammarata
3fe48db44f Fail in ec2 if exact_count is specified without using count_tag 
Fixes ansible/ansible#9431
 2014-11-03 09:43:26 -06:00
James Cammarata
30f46c9f8e Merge pull request #230 from lorin/ec2_snapshot_wait 
ec2_snapshot: document wait, wait_timeout params
 2014-10-27 11:10:09 -05:00
James Cammarata
a5d0fac078 Merge pull request #219 from adamchainz/devel 
Update syntax for cloudformation example
 2014-10-27 10:55:44 -05:00
Lorin Hochstein
142fd9b06d ec2_snapshot: document wait, wait_timeout params 
Document the wait and wait_timeout params for ec2_snapshot.

This is important because snapshots can take a long time to complete,
and the module defaults to wait=yes.
 2014-10-26 16:26:33 -04:00
Adam Chainz
f4ca909d59 Update syntax for cloudformation example 2014-10-23 17:23:24 +01:00
Jaanus Torp
0a6561f5d4 Fixed really annoying omission in the example without the task would complete without errors or warnings but delete all egress rules 2014-10-23 13:19:23 +01:00
Matt Martz
b8e82f8504 Merge pull request #115 from sivel/autoscale-more-args 
rax_scaling_group module improvements
 2014-10-22 12:27:15 -05:00
Matt Martz
7e3b7aff13 Merge pull request #116 from sivel/rax-skip-deleted 
rax module: Don't count DELETED servers when adding new servers
 2014-10-22 12:25:25 -05:00
Toshio Kuratomi
72185b4d9a Merge pull request #194 from rglew/devel 
Fixed bug #193 where parameter name was set incorrectly
 2014-10-22 11:29:07 -04:00
James Cammarata
3132463145 Merge pull request #187 from jorgebastida/devel 
ec2_asg: Initialize create_changed and replace_changed
 2014-10-21 22:48:08 -05:00
James Cammarata
47f11e87e3 Merge pull request #183 from sb98052/devel 
Added user, tenant and password to module parameters declaration
 2014-10-21 22:36:19 -05:00
Tim Gerla
044cef8419 Fix a typo of a function call 2014-10-17 10:47:17 -07:00
Richard Glew
043b38f2ef Fixed bug #193 where parameter name was set incorrectly 2014-10-17 09:28:58 +10:00
Jorge Bastida
9c5cdd6daf Initialize create_changed and replace_changed 2014-10-14 15:22:26 +01:00
Sapan Bhatia
8821091909 Added user, tenant and password to module parameters declaration -- 
these parameters are already handled by the implementation
 2014-10-14 02:24:58 -04:00
Matt Martz
5dcc0ff0d9 Don't count DELETED servers when adding new servers 2014-10-01 18:30:40 -05:00
Matt Martz
fbadfd5902 Fix determination if a few configurations change in the launch config 2014-10-01 18:24:48 -05:00
Matt Martz
924bff9481 Ensure that files is the right type, and that we send the formatted personality var 2014-10-01 18:24:47 -05:00
Matt Martz
0a399fd971 Support config_drive and user_data in rax_scaling_group 2014-10-01 18:24:47 -05:00
Phillip Holmes
7402827950 Route53 fix - forcing zone_in, record_in to lower case 
Fixed the .tolower to .lower() for correct syntax (copied change from older notes).
 2014-09-29 16:23:41 -05:00
Phillip Holmes
b3e84f2dd4 Route53 fix - forcing zone_in, record_in to lower case 
It turns out the Route53 API cares if the zone and record specified in the playbook are lower case or not when deleting a record. If you use a variable to name your servers and care about case, using that same proper case name will cause Route53 DNS delete requests to fail.

The change requested adds .lower() to the module.params.get for both zone and record when used in the underlying code.

Both zone and record are mandatory variables, and as such a more complicated implementation is not needed, as they must always be specified when using this module see lines 169 and 170 for the required state).

If you use lowercase names (or don't use a name variable and share it between a tag and DNS entries) then you will never see this issue.

Tested/Confirmed as an issue in Ansible 1.6.6 and above.
 2014-09-29 16:20:25 -05:00
Michael DeHaan
385a037cd6 package files 2014-09-26 11:05:47 -04:00
Michael DeHaan
c8e1a2077e file extensions! 2014-09-26 10:37:56 -04:00
Michael DeHaan
417309a626 Restructuring. 2014-09-26 10:13:26 -04:00
Michael DeHaan
73123b69fa Move modules into subdirectory. 2014-09-26 09:23:50 -04:00
James Cammarata
61f6a70401 Skip null id route tables when adding/deleting them in ec2_vpc 
Fixes #8552
 2014-09-23 14:51:56 -05:00
Steven Ringo
bcb78335cf Expand description for ec2_facts module 2014-09-23 08:53:57 +10:00
Michael Scherer
7420a450a5 Fix indentation and bug #8895 2014-09-21 17:12:29 +02:00
James Cammarata
0d0576a97f Add note on ec2_lc regarding immutability of configs once created 
Fixes #8927
 2014-09-19 15:17:46 -05:00
James Cammarata
d5546d7a0a Merge pull request #9052 from EvanDotPro/docs/fix-rax-public-key-example 
Update rax root pubkey example
 2014-09-18 13:25:36 -05:00
Evan Coury
54a979ddd3 Update rax root pubkey example 
The example was showing how to use the `files` option to pass in a local file as an authorized public key for root. While this works, it's a bit sloppy, given that there's a specific option, `key_name` which will use one of your public keys on your rackspace account and add it as an authorized key for root. In our case, one of our admins didn't notice the `key_name` option because they scrolled straight to the example and saw the `files` strategy.

I propose that the example still shows `files`, but not using a root public key as an example, and instead also demonstrate the `key_name` option so that it's clear from the example how to get the initial root public key deployed.
 2014-09-17 18:06:59 -07:00
Sam Pierson
3f8e45f864 [#9048] convert Route53 TTL to integer before comparison 
boto/Route53 are returning TTL as a string.
The route53 module is comparing it with an integer and therfore thinks the DNS entry has always changed.
 2014-09-17 14:47:27 -07:00
James Cammarata
633f86d30a Allow filtering by availability zone for exact_count with ec2 
Fixes #8863
 2014-09-17 15:49:26 -05:00
James Cammarata
2fac1fd865 Ensure port in docker expose list is a string 
Fixes #8731
 2014-09-16 21:38:49 -05:00
James Cammarata
7b5c76e122 Merge pull request #9026 from tedder/patch-1 
rearrange description/short_description
 2014-09-16 14:04:45 -05:00
Toshio Kuratomi
3f4bdce67e My fix was wrong again. Base this try off of @mantiz's fix in #9016 2014-09-16 11:46:09 -07:00
Toshio Kuratomi
e51bcf90a0 Fix the case where a docker image is not part of a namespace. 
Fixes #9016
 2014-09-16 11:39:15 -07:00
James Cammarata
1a1d1cc609 Add note to ec2_vol state param regarding list option added in 1.8 2014-09-16 13:20:39 -05:00
Ted Timmons
141b6ce3d0 further cleanup 2014-09-16 09:37:01 -07:00
Ted Timmons
43e6aa19d1 rearrange description/short_description 
it's really dorked on [the documentation page](http://docs.ansible.com/ec2_elb_lb_module.html). This puts it in line with other modules.
 2014-09-16 09:35:20 -07:00
Toshio Kuratomi
4094edf92f Fix splitting the tag from the image name 
Fixes #8983
 2014-09-15 09:01:07 -07:00
James Cammarata
71f5d88586 Merge pull request #8973 from sergevanginderachter/vsphere_guest_docfix 
vsphere_guest module doc fix
 2014-09-15 09:27:15 -05:00
James Cammarata
220349d83b Merge pull request #8586 from ericwb/fix_glance_doc 
Fix the docs for glance_image.endpoint_type
 2014-09-11 19:44:43 -05:00
Toshio Kuratomi
732b6f0a23 Omit tag from parsed image name 
Fixes #8925
 2014-09-11 11:27:00 -07:00
Serge van Ginderachter
d3ce105108 vsphere_guest module doc fix 2014-09-11 15:47:22 +02:00
Michael DeHaan
f3249d72be Remove reference to deprecated input mechanism. 2014-09-10 17:45:24 -04:00
Michael DeHaan
717b53cad9 Merge pull request #8901 from jsmartin/ec2_replace_all 
Rolling Instance Replace.  Fixes #8501.
 2014-09-10 17:42:35 -04:00
James Martin
c0f1c5a222 Rolling termination working. Fixes #8501. 2014-09-10 01:26:11 -04:00
James Cammarata
9240f39ae1 Fixing docs error for new region param 2014-09-09 15:53:33 -05:00
Toshio Kuratomi
f99ed17b42 Document how to use region in s3 module 2014-09-08 16:02:08 -07:00
Toshio Kuratomi
faee2be453 Enable region parameter to specify new bucket location 2014-09-08 15:59:24 -07:00
James Cammarata
2760fa23f7 Merge pull request #8902 from mathieumd/devel 
Remove namespace restrictions in ec2_metric_alarm
 2014-09-08 14:48:52 -05:00
Nathan Sosnovske
57f3888b13 Noted in documentation that standalone esxi hosts should use ha-datacenter for the datacenter string 2014-09-06 15:04:06 -07:00
Mathieu MD
d403f06e54 Remove namespace restrictions in ec2_metric_alarm 
Fixes #7970
 2014-09-05 22:09:29 +02:00
James Cammarata
091e39df27 Merge pull request #8868 from mike-d-d/fix-route_tables-default 
Fix #8666 for real
 2014-09-04 10:00:40 -05:00
tepwil
8dad0ab509 Fixing bug in cross-zone load balancing enablement 
Fixes #8861
 2014-09-04 09:53:41 -05:00
Mike Dixon
024eb4d54b Fix #8666 for real 
Commit 311ec543af ("If not specified, do not modify subnet/route_tables for ec2 VPCs") mostly fixed the problem, except that it left defaults for subnets and route_tables so that not specifying them still deleted them.
 2014-09-02 19:16:39 -07:00
James Cammarata
7c9ac2aee1 Merge pull request #8832 from sivel/rax-validate-regions 
rax modules: Perform region validation early
 2014-09-02 13:03:31 -05:00
James Cammarata
77390c41c9 Merge pull request #8831 from swindmill/devel 
Add additional Azure Regions
 2014-09-02 13:02:44 -05:00
James Cammarata
aa815340a8 Merge pull request #8803 from stygstra/quantum_subnet-docs 
Fix description on quantum_subnet module
 2014-09-02 11:08:35 -05:00
James Cammarata
3bd4acb7af Merge pull request #8773 from mrevilme/ec2_fix_instances_list 
Always return a list even if its empty.
 2014-09-02 10:02:06 -05:00
Matt Martz
1c43bc322f Perform region validation early to be more explicit about invalid region failures 2014-09-02 09:17:40 -05:00
Sterling Windmill
c098183b9d add additional Azure Regions 2014-08-31 09:15:46 -04:00
David Stygstra
ce208d67de Fix description on quantum_subnet module 2014-08-28 10:43:00 -04:00
Jonathan Richard Henry Evans (JRHE)
f89cae2f7c Adds us-gov-west-1 aws ec2 region to cloud library 2014-08-27 22:06:15 -04:00
Emil Palm
8a4d6577a1 Always return a list even if its empty. 2014-08-27 11:07:19 +02:00
James Cammarata
fa21b336f8 Stop/remove existing docker container if the specified tag is different 
Fixes #8278
 2014-08-26 13:36:42 -05:00
James Cammarata
88dd9a3aec Merge branch 'feature/makes-ec2-lc-boto-iso-functional' of https://github.com/botify-labs/ansible into botify-labs-feature/makes-ec2-lc-boto-iso-functional 2014-08-26 13:00:17 -05:00
James Cammarata
c4b4dee3a3 Add boto support checks for new ec2_elb_lb attribute fields 
Also minor fixes like adjusting version_added fields, etc.
 2014-08-26 10:58:25 -05:00
James Cammarata
7208b1c7e2 Merge branch 'elb-enhancements' of https://github.com/dataxu/ansible into dataxu-elb-enhancements 2014-08-26 10:05:34 -05:00
Peter Fry
c9ad36c375 Add support for volume encryption to ec2_vol 
Fixes #7775
 2014-08-25 16:21:28 -05:00
Eric D. White
6f9cb7ab61 Issue 8735 - module docker - expose values should be striped to ensure port forwarding works. 2014-08-24 21:07:26 +01:00
James Cammarata
3373e82d83 Fixing bug with image/tag pulling in docker module 
Fixes #8670
 2014-08-22 14:08:40 -05:00
Michael DeHaan
0278b40f5f Merge pull request #8659 from willthames/rds_module_connection_fix 
rds_module: Fix AWS connection
 2014-08-22 14:45:27 -04:00
James Cammarata
bf07c90868 If not specified, do not modify subnet/route_tables for ec2 VPCs 
Also fixes a bug whereby any changes to the route_tables were not
properly reflected by setting changed=True.

Fixes #8666
 2014-08-22 11:03:41 -05:00
James Cammarata
1c3e28767d Remove incorrect use of module.fail_json during import check for s3 
Fixes #8698
 2014-08-20 12:04:46 -05:00
Paul Armstrong
86dd24af92 asg-properties Get all the properties from ASG's 2014-08-19 15:25:47 -07:00
James Cammarata
d6375cd3c1 Fix bad commit from #8095 and fix bad splitting on :'s in the image 
Fixes #8095
Fixes #8658
 2014-08-18 10:37:07 -05:00
Will Thames
3992ef989b Fix RDS AWS connection 
Use the common AWS connection improvements so that security_token,
boto_profile etc. are taken into account
 2014-08-18 14:43:07 +10:00
James Cammarata
f729ab8e67 Make env param a dict type instead of list 
Also modifies param type checking code to remove whitespace from
around params before splitting them into k=v pairs.

Fixes #8199
 2014-08-15 11:04:27 -05:00
Eric Brown
2dfafbf071 Update keystone_user doc for tenant_description 
The description var should be tenant_description.

Closes-bug: #8299
 2014-08-12 16:49:33 -07:00
Eric Brown
7af13b2923 Fix the docs for glance_image.endpoint_type 
The endpoint_type option was added in version 1.7,
so the docs need to state this.  Also the the description
is too brief.
 2014-08-12 16:40:01 -07:00
Michael DeHaan
5eb8a59899 Merge pull request #8525 from kamaln7/patch-1 
Replace all occurrences of "Digital Ocean" with "DigitalOcean"
 2014-08-11 16:04:04 -04:00
Matt Martz
83a8229c95 Dedupe code and switch to shared doc fragments 2014-08-08 19:32:22 -05:00
James Cammarata
32acd276b6 Merge branch 'jmoretti-add-docker-api-version-parameter' into devel 2014-08-08 15:04:13 -05:00