Merge pull request #5806 from sivel/rax-mod-utils-improvements

Rax mod utils improvements
This commit is contained in:
jctanner 2014-01-29 16:17:06 -08:00
commit 530e22f9e2

View file

@ -26,6 +26,49 @@ options:
api_key:
description:
- Rackspace API key (overrides I(credentials))
aliases:
- password
auth_endpoint:
description:
- The URI of the authentication service
default: https://identity.api.rackspacecloud.com/v2.0/
version_added: 1.5
credentials:
description:
- File to find the Rackspace credentials in (ignored if I(api_key) and
I(username) are provided)
default: null
aliases:
- creds_file
env:
description:
- Environment as configured in ~/.pyrax.cfg,
see U(https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#pyrax-configuration)
version_added: 1.5
identity_type:
description:
- Authentication machanism to use, such as rackspace or keystone
default: rackspace
version_added: 1.5
region:
description:
- Region to create an instance in
default: DFW
tenant_id:
description:
- The tenant ID used for authentication
version_added: 1.5
tenant_name:
description:
- The tenant name used for authentication
version_added: 1.5
username:
description:
- Rackspace username (overrides I(credentials))
verify_ssl:
description:
- Whether or not to require SSL validation of API endpoints
version_added: 1.5
auto_increment:
description:
- Whether or not to increment a single number with the name of the
@ -43,12 +86,6 @@ options:
- number count to start at
default: 1
version_added: 1.4
credentials:
description:
- File to find the Rackspace credentials in (ignored if I(api_key) and
I(username) are provided)
default: null
aliases: ['creds_file']
disk_config:
description:
- Disk partitioning strategy
@ -103,18 +140,11 @@ options:
or C(label).
default: ['public', 'private']
version_added: 1.4
region:
description:
- Region to create an instance in
default: DFW
state:
description:
- Indicate desired state of the resource
choices: ['present', 'absent']
default: present
username:
description:
- Rackspace username (overrides I(credentials))
wait:
description:
- wait for the instance to be in state 'running' before returning