openstack/nova
Code Issues Proposed changes

Merge "More specific error messages on building BDM"

Browse Source
This commit is contained in:
Jenkins
2015-08-13 00:04:46 +00:00
committed by Gerrit Code Review
parent 5a494bdf0e b292f47e1b
commit fc10768319
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@@ -2095,7 +2095,9 @@ class ComputeManager(manager.Manager):
# Make sure the async call finishes # Make sure the async call finishes
if network_info is not None: if network_info is not None:
network_info.wait(do_raise=False) network_info.wait(do_raise=False)
except exception.UnexpectedTaskStateError as e: except (exception.UnexpectedTaskStateError,
exception.VolumeLimitExceeded,
exception.InvalidBDM) as e:
# Make sure the async call finishes # Make sure the async call finishes
if network_info is not None: if network_info is not None:
network_info.wait(do_raise=False) network_info.wait(do_raise=False)