From 858efd00e32b9fbb302553ca8fd5d0d66f7aa817 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 1 Jun 2013 11:52:28 -0400 Subject: [PATCH] Standarize docs --- library/cloud/glance_image | 6 +++--- library/cloud/keystone_user | 2 +- library/cloud/nova_compute | 4 ++-- library/cloud/nova_keypair | 4 ++-- library/cloud/quantum_floating_ip | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/library/cloud/glance_image b/library/cloud/glance_image index b6f015eb83..af95c7d6ef 100644 --- a/library/cloud/glance_image +++ b/library/cloud/glance_image @@ -32,12 +32,12 @@ options: description: - Password of login user required: true - default: yes + default: 'yes' login_tenant_name: description: - The tenant name of the login user required: true - default: yes + default: 'yes' auth_url: description: - The keystone url for authentication @@ -87,7 +87,7 @@ options: description: - Wether the image can be accesed publically required: false - default: yes + default: 'yes' copy_from: description: - A url from where the image can be downloaded, mutually exculsive with file parameter diff --git a/library/cloud/keystone_user b/library/cloud/keystone_user index 79772a74a8..65b4a6604f 100644 --- a/library/cloud/keystone_user +++ b/library/cloud/keystone_user @@ -19,7 +19,7 @@ options: description: - Password of login user required: false - default: yes + default: 'yes' token: description: - The token to be uses in case the password is not specified diff --git a/library/cloud/nova_compute b/library/cloud/nova_compute index 1a3b6cc42b..d9afc53a36 100644 --- a/library/cloud/nova_compute +++ b/library/cloud/nova_compute @@ -38,12 +38,12 @@ options: description: - Password of login user required: true - default: True + default: 'yes' login_tenant_name: description: - The tenant name of the login user required: true - default: True + default: 'yes' auth_url: description: - The keystone url for authentication diff --git a/library/cloud/nova_keypair b/library/cloud/nova_keypair index 5660c3ddc4..6edce4da26 100644 --- a/library/cloud/nova_keypair +++ b/library/cloud/nova_keypair @@ -38,12 +38,12 @@ options: description: - Password of login user required: true - default: True + default: 'yes' login_tenant_name: description: - The tenant name of the login user required: true - default: True + default: 'yes' auth_url: description: - The keystone url for authentication diff --git a/library/cloud/quantum_floating_ip b/library/cloud/quantum_floating_ip index 84a87a0044..79d21d1915 100644 --- a/library/cloud/quantum_floating_ip +++ b/library/cloud/quantum_floating_ip @@ -40,12 +40,12 @@ options: description: - Password of login user required: true - default: True + default: 'yes' login_tenant_name: description: - The tenant name of the login user required: true - default: True + default: 'yes' auth_url: description: - The keystone url for authentication @@ -160,12 +160,12 @@ def _create_floating_ip(quantum, module, port_id, net_id): try: result = quantum.create_floatingip({'floatingip': kwargs}) except Exception as e: - 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.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'] ) def _get_net_id(quantum, module): kwargs = { - 'name': module.params['network_name'], + 'name': module.params['network_name'], } try: networks = quantum.list_networks(**kwargs)