Docs/style

reviewable/pr18780/r1
Michael DeHaan 12 years ago
parent d5ff40ecc3
commit b63b0d7b11

@ -37,12 +37,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
@ -135,7 +135,6 @@ def _get_net_id(quantum, module):
return None return None
return networks['networks'][0]['id'] return networks['networks'][0]['id']
def _get_port_id(quantum, module, router_id, network_id): def _get_port_id(quantum, module, router_id, network_id):
kwargs = { kwargs = {
'device_id': router_id, 'device_id': router_id,
@ -183,8 +182,10 @@ def main():
quantum = _get_quantum_client(module, module.params) quantum = _get_quantum_client(module, module.params)
router_id = _get_router_id(module, quantum) router_id = _get_router_id(module, quantum)
if not router_id: if not router_id:
module.fail_json(msg="failed to get the router id, please check the router name") module.fail_json(msg="failed to get the router id, please check the router name")
network_id = _get_net_id(quantum, module) network_id = _get_net_id(quantum, module)
if not network_id: if not network_id:
module.fail_json(msg="failed to get the network id, please check the network name and make sure it is external") module.fail_json(msg="failed to get the network id, please check the network name and make sure it is external")
@ -195,6 +196,7 @@ def main():
_add_gateway_router(quantum, module, router_id, network_id) _add_gateway_router(quantum, module, router_id, network_id)
module.exit_json(changed=True, result="created") module.exit_json(changed=True, result="created")
module.exit_json(changed=False, result="success") module.exit_json(changed=False, result="success")
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
port_id = _get_port_id(quantum, module, router_id, network_id) port_id = _get_port_id(quantum, module, router_id, network_id)
if not port_id: if not port_id:
@ -202,8 +204,6 @@ def main():
_remove_gateway_router(quantum, module, router_id) _remove_gateway_router(quantum, module, router_id)
module.exit_json(changed=True, result="Deleted") module.exit_json(changed=True, result="Deleted")
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
main() main()

Loading…
Cancel
Save