internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing exceptions (#45775)

Browse Source 
* Replace non-existing OpenStackCloudTimeout exception. Fixes: #45151

* Replace OpenStackCloudURINotFound that doesn't exist in the 'exceptions' module
This commit is contained in:
Anna Nowak
2018-10-30 12:50:46 +01:00
committed by ansibot
parent bfbf012da4
commit eb39c461ce
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/modules/cloud/openstack/os_quota.py
View File

@@ -249,12 +249,12 @@ def _get_quotas(sdk, module, cloud, project):
quota = {} quota = {}
try: try:
quota['volume'] = _get_volume_quotas(cloud, project) quota['volume'] = _get_volume_quotas(cloud, project)
except sdk.exceptions.OpenStackCloudURINotFound: except sdk.exceptions.NotFoundException:
module.warn("No public endpoint for volumev2 service was found. Ignoring volume quotas.") module.warn("No public endpoint for volumev2 service was found. Ignoring volume quotas.")
try: try:
quota['network'] = _get_network_quotas(cloud, project) quota['network'] = _get_network_quotas(cloud, project)
except sdk.exceptions.OpenStackCloudURINotFound: except sdk.exceptions.NotFoundException:
module.warn("No public endpoint for network service was found. Ignoring network quotas.") module.warn("No public endpoint for network service was found. Ignoring network quotas.")
quota['compute'] = _get_compute_quotas(cloud, project) quota['compute'] = _get_compute_quotas(cloud, project)

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

@@ -139,7 +139,7 @@ def main():
result='Detached volume from server' result='Detached volume from server'
) )
except (sdk.exceptions.OpenStackCloudException, sdk.exceptions.OpenStackCloudTimeout) as e: except (sdk.exceptions.OpenStackCloudException, sdk.exceptions.ResourceTimeout) as e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))

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

@@ -124,7 +124,7 @@ def _absent_volume(module, cloud, sdk):
changed = cloud.delete_volume(name_or_id=module.params['display_name'], changed = cloud.delete_volume(name_or_id=module.params['display_name'],
wait=module.params['wait'], wait=module.params['wait'],
timeout=module.params['timeout']) timeout=module.params['timeout'])
except sdk.exceptions.OpenStackCloudTimeout: except sdk.exceptions.ResourceTimeout:
module.exit_json(changed=changed) module.exit_json(changed=changed)
module.exit_json(changed=changed) module.exit_json(changed=changed)

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

@@ -170,7 +170,7 @@ def main():
module.fail_json( module.fail_json(
msg="No volume with name or id '{0}' was found.".format( msg="No volume with name or id '{0}' was found.".format(
module.params['volume'])) module.params['volume']))
except (sdk.exceptions.OpenStackCloudException, sdk.exceptions.OpenStackCloudTimeout) as e: except (sdk.exceptions.OpenStackCloudException, sdk.exceptions.ResourceTimeout) as e:
module.fail_json(msg=e.message) module.fail_json(msg=e.message)