internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-16 13:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenStack module failure output

Browse Source 
The exception message, when shade fails, will contain much more
specific information about the failure if the exception is treated
as a string. The 'message' attribute alone is usually not helpful.
This commit is contained in:
David Shrewsbury
2016-01-13 11:00:16 -05:00
committed by Matt Clay
parent 18ff22348a
commit aed44e8886
24 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/modules/cloud/openstack/os_auth.py
View File

@@ -57,7 +57,7 @@ def main():
auth_token=cloud.auth_token,
service_catalog=cloud.service_catalog))
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_floating_ip.py
View File

@@ -176,7 +176,7 @@ def main():
module.exit_json(changed=True, floating_ip=f_ip)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_image.py
View File

@@ -183,7 +183,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_image_facts.py
View File

@@ -148,7 +148,7 @@ def main():
openstack_image=image))
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_ironic.py
View File

@@ -336,7 +336,7 @@ def main():
module.exit_json(changed=False, result="Server not found")
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_ironic_node.py
View File

@@ -323,7 +323,7 @@ def main():
"maintenance, off")
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_keypair.py
View File

@@ -162,7 +162,7 @@ def main():
module.exit_json(changed=False)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_network.py
View File

@@ -159,7 +159,7 @@ def main():
module.exit_json(changed=True)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_networks_facts.py
View File

@@ -132,7 +132,7 @@ def main():
openstack_networks=networks))
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_nova_flavor.py
View File

@@ -232,7 +232,7 @@ def main():
module.exit_json(changed=False)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_object.py
View File

@@ -117,7 +117,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_port.py
View File

@@ -383,7 +383,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_router.py
View File

@@ -352,7 +352,7 @@ def main():
module.exit_json(changed=True)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_security_group.py
View File

@@ -133,7 +133,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_security_group_rule.py
View File

@@ -320,7 +320,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_server.py
View File

@@ -606,7 +606,7 @@ def main():
_get_server_state(module, cloud)
_delete_server(module, cloud)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_server_actions.py
View File

@@ -204,7 +204,7 @@ def main():
module.exit_json(changed=True)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_server_facts.py
View File

@@ -89,7 +89,7 @@ def main():
openstack_servers=openstack_servers))
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_server_volume.py
View File

@@ -144,7 +144,7 @@ def main():
)
except (shade.OpenStackCloudException, shade.OpenStackCloudTimeout) as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_utils/common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_subnet.py
View File

@@ -315,7 +315,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py

2
lib/ansible/modules/cloud/openstack/os_subnets_facts.py
View File

@@ -145,7 +145,7 @@ def main():
openstack_subnets=subnets))
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_user.py
View File

@@ -202,7 +202,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *

2
lib/ansible/modules/cloud/openstack/os_user_group.py
View File

@@ -106,7 +106,7 @@ def main():
module.exit_json(changed=changed)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message, extra_data=e.extra_data)
module.fail_json(msg=str(e), extra_data=e.extra_data)
from ansible.module_utils.basic import *

2
lib/ansible/modules/cloud/openstack/os_volume.py
View File

@@ -152,7 +152,7 @@ def main():
if state == 'absent':
_absent_volume(module, cloud)
except shade.OpenStackCloudException as e:
module.fail_json(msg=e.message)
module.fail_json(msg=str(e))
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *