x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V raise error on mdproxy init"

Browse Source
This commit is contained in:
Jenkins 2017-09-27 21:00:00 +00:00 committed by Gerrit Code Review
commit 68f843fe4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx/plugins/nsx_v/md_proxy.py
View File

@ -165,7 +165,6 @@ class NsxVMetadataProxyHandler(object):
return int_net['network_id'] return int_net['network_id']
def _get_internal_network_and_subnet(self, context): def _get_internal_network_and_subnet(self, context):
# Try to find internal net, internal subnet. If not found, create new # Try to find internal net, internal subnet. If not found, create new
internal_net = self._get_internal_net_by_az(context) internal_net = self._get_internal_net_by_az(context)
internal_subnet = None internal_subnet = None
@ -194,9 +193,10 @@ class NsxVMetadataProxyHandler(object):
self.nsxv_plugin.delete_network(context, self.nsxv_plugin.delete_network(context,
internal_net) internal_net)
LOG.exception("Exception %s while creating internal " error = (_("Exception %s while creating internal "
"network for metadata service", e) "network for metadata service") % e)
return LOG.exception(error)
raise nsxv_exc.NsxPluginException(err_msg=error)
# Update the new network_id in DB # Update the new network_id in DB
nsxv_db.create_nsxv_internal_network( nsxv_db.create_nsxv_internal_network(