Commit 858efd00 by Michael DeHaan

Standarize docs

parent d0286f76
...@@ -32,12 +32,12 @@ options: ...@@ -32,12 +32,12 @@ options:
description: description:
- Password of login user - Password of login user
required: true required: true
default: yes default: 'yes'
login_tenant_name: login_tenant_name:
description: description:
- The tenant name of the login user - The tenant name of the login user
required: true required: true
default: yes default: 'yes'
auth_url: auth_url:
description: description:
- The keystone url for authentication - The keystone url for authentication
...@@ -87,7 +87,7 @@ options: ...@@ -87,7 +87,7 @@ options:
description: description:
- Wether the image can be accesed publically - Wether the image can be accesed publically
required: false required: false
default: yes default: 'yes'
copy_from: copy_from:
description: description:
- A url from where the image can be downloaded, mutually exculsive with file parameter - A url from where the image can be downloaded, mutually exculsive with file parameter
......
...@@ -19,7 +19,7 @@ options: ...@@ -19,7 +19,7 @@ options:
description: description:
- Password of login user - Password of login user
required: false required: false
default: yes default: 'yes'
token: token:
description: description:
- The token to be uses in case the password is not specified - The token to be uses in case the password is not specified
......
...@@ -38,12 +38,12 @@ options: ...@@ -38,12 +38,12 @@ options:
description: description:
- Password of login user - Password of login user
required: true required: true
default: True default: 'yes'
login_tenant_name: login_tenant_name:
description: description:
- The tenant name of the login user - The tenant name of the login user
required: true required: true
default: True default: 'yes'
auth_url: auth_url:
description: description:
- The keystone url for authentication - The keystone url for authentication
......
...@@ -38,12 +38,12 @@ options: ...@@ -38,12 +38,12 @@ options:
description: description:
- Password of login user - Password of login user
required: true required: true
default: True default: 'yes'
login_tenant_name: login_tenant_name:
description: description:
- The tenant name of the login user - The tenant name of the login user
required: true required: true
default: True default: 'yes'
auth_url: auth_url:
description: description:
- The keystone url for authentication - The keystone url for authentication
......
...@@ -40,12 +40,12 @@ options: ...@@ -40,12 +40,12 @@ options:
description: description:
- Password of login user - Password of login user
required: true required: true
default: True default: 'yes'
login_tenant_name: login_tenant_name:
description: description:
- The tenant name of the login user - The tenant name of the login user
required: true required: true
default: True default: 'yes'
auth_url: auth_url:
description: description:
- The keystone url for authentication - The keystone url for authentication
...@@ -160,12 +160,12 @@ def _create_floating_ip(quantum, module, port_id, net_id): ...@@ -160,12 +160,12 @@ def _create_floating_ip(quantum, module, port_id, net_id):
try: try:
result = quantum.create_floatingip({'floatingip': kwargs}) result = quantum.create_floatingip({'floatingip': kwargs})
except Exception as e: except Exception as e:
module.fail_json( msg = "There was an error in updating the floating ip address: %s" % e.message) module.fail_json(msg = "There was an error in updating the floating ip address: %s" % e.message)
module.exit_json( changed = True, result = result, public_ip=result['floatingip']['floating_ip_address'] ) module.exit_json(changed = True, result = result, public_ip=result['floatingip']['floating_ip_address'] )
def _get_net_id(quantum, module): def _get_net_id(quantum, module):
kwargs = { kwargs = {
'name': module.params['network_name'], 'name': module.params['network_name'],
} }
try: try:
networks = quantum.list_networks(**kwargs) networks = quantum.list_networks(**kwargs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment