openstack
/
shade
Code Issues Proposed changes

Catch all exceptions around port for ip finding 

If neutron does not work, then it's going to throw inside of list_ports,
which is going to send an OpenStackCloudException through search_ports,
which is then not going to be caught by the NeutronClientException trap
here.

Change-Id: Id25ff2688de55f4b39a145185269bc7b7ccb89eb
This commit is contained in:
Monty Taylor 2015-06-19 09:25:13 -04:00 committed by David Shrewsbury
parent 21bc0f3e1e
commit 7cde7c5ad1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shade/meta.py
View File

@ -17,8 +17,6 @@ import bunch
import logging
import six
from neutronclient.common.exceptions import NeutronClientException
from shade import exc
from shade import _utils
@ -80,7 +78,7 @@ def get_server_external_ipv4(cloud, server):
server_ports = cloud.search_ports(
filters={'device_id': server.id})
ext_nets = cloud.search_networks(filters={'router:external': True})
except NeutronClientException as e:
except Exception as e:
log.debug(
"Something went wrong talking to neutron API: "
"'{msg}'. Trying with Nova.".format(msg=str(e)))