openstack
/
neutron
Code Issues Proposed changes

Merge "L3 agent: log traceback on floating ip setup failure" into stable/liberty

This commit is contained in:
Jenkins 2016-04-22 15:28:16 +00:00 committed by Gerrit Code Review
parent 580a1891e4 92d58fc1fb
commit 66dfa01243
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/agent/l3/router_info.py
View File

@ -24,7 +24,7 @@ from neutron.common import constants as l3_constants
from neutron.common import exceptions as n_exc
from neutron.common import ipv6_utils
from neutron.common import utils as common_utils
from neutron.i18n import _LW
from neutron.i18n import _, _LW
from neutron.ipam import utils as ipam_utils
LOG = logging.getLogger(__name__)
@ -175,8 +175,9 @@ class RouterInfo(object):
self.process_floating_ip_nat_rules()
except Exception:
# TODO(salv-orlando): Less broad catching
raise n_exc.FloatingIpSetupException(
'L3 agent failure to setup NAT for floating IPs')
msg = _('L3 agent failure to setup NAT for floating IPs')
LOG.exception(msg)
raise n_exc.FloatingIpSetupException(msg)
def _add_fip_addr_to_device(self, fip, device):
"""Configures the floating ip address on the device.
@ -252,8 +253,9 @@ class RouterInfo(object):
return self.process_floating_ip_addresses(interface_name)
except Exception:
# TODO(salv-orlando): Less broad catching
raise n_exc.FloatingIpSetupException('L3 agent failure to setup '
'floating IPs')
msg = _('L3 agent failure to setup floating IPs')
LOG.exception(msg)
raise n_exc.FloatingIpSetupException(msg)
def put_fips_in_error_state(self):
fip_statuses = {}