diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-24 20:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-24 20:29:36 +0000 |
| commit | 7d7568da5fd2b043e283697c44baf2afa1e63bea (patch) | |
| tree | 02689507f43183cb6c4adf267a800fdada01bb23 /nova/compute | |
| parent | d4c7e88c86eabdd48558717e20966d7b4d092eec (diff) | |
| parent | 3d27a0e74bde3878af76414dc4020ac6f9f24e4e (diff) | |
| download | nova-7d7568da5fd2b043e283697c44baf2afa1e63bea.tar.gz nova-7d7568da5fd2b043e283697c44baf2afa1e63bea.tar.xz nova-7d7568da5fd2b043e283697c44baf2afa1e63bea.zip | |
Merge "Handle NoMoreFixedIps in _shutdown_instance."
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e0b2f38e8..1a6479f7f 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1345,7 +1345,7 @@ class ComputeManager(manager.SchedulerDependentManager): # get network info before tearing down try: network_info = self._get_instance_nw_info(context, instance) - except exception.NetworkNotFound: + except (exception.NetworkNotFound, exception.NoMoreFixedIps): network_info = network_model.NetworkInfo() # NOTE(vish) get bdms before destroying the instance |