fix missing exceptions openstack modules (#48088)
* Fix missing exceptions (#45775)
* Replace non-existing OpenStackCloudTimeout exception. Fixes: #45151
* Replace OpenStackCloudURINotFound that doesn't exist in the 'exceptions' module
(cherry picked from commit eb39c461ce
)
* add changelog
This commit is contained in:
parent
fb551bf62c
commit
953568e213
5 changed files with 7 additions and 5 deletions
2
changelogs/fragments/45151-fix-os-exception.yaml
Normal file
2
changelogs/fragments/45151-fix-os-exception.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- replace renamed exceptions in multiple openstack modules
|
|
@ -249,12 +249,12 @@ def _get_quotas(sdk, module, cloud, project):
|
|||
quota = {}
|
||||
try:
|
||||
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.")
|
||||
|
||||
try:
|
||||
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.")
|
||||
|
||||
quota['compute'] = _get_compute_quotas(cloud, project)
|
||||
|
|
|
@ -139,7 +139,7 @@ def main():
|
|||
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))
|
||||
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ def _absent_volume(module, cloud, sdk):
|
|||
changed = cloud.delete_volume(name_or_id=module.params['display_name'],
|
||||
wait=module.params['wait'],
|
||||
timeout=module.params['timeout'])
|
||||
except sdk.exceptions.OpenStackCloudTimeout:
|
||||
except sdk.exceptions.ResourceTimeout:
|
||||
module.exit_json(changed=changed)
|
||||
|
||||
module.exit_json(changed=changed)
|
||||
|
|
|
@ -186,7 +186,7 @@ def main():
|
|||
module.fail_json(
|
||||
msg="No volume with name or id '{0}' was found.".format(
|
||||
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)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue