x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V: save PUT when restarting neutron"

Browse Source
This commit is contained in:
Jenkins 2017-08-04 18:21:01 +00:00 committed by Gerrit Code Review
commit 7bcd7d009f
1 changed files with 6 additions and 2 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

@ -359,6 +359,7 @@ class NsxVMetadataProxyHandler(object):
self.nsxv_plugin.nsx_v.vcns, edge_id) self.nsxv_plugin.nsx_v.vcns, edge_id)
vs = lb_obj.virtual_servers.get(METADATA_VSE_NAME) vs = lb_obj.virtual_servers.get(METADATA_VSE_NAME)
update_md_proxy = False
if vs: if vs:
md_members = {member.payload['ipAddress']: member.payload['name'] md_members = {member.payload['ipAddress']: member.payload['name']
for member in vs.default_pool.members.values()} for member in vs.default_pool.members.values()}
@ -369,7 +370,8 @@ class NsxVMetadataProxyHandler(object):
set(cfg.CONF.nsxv.nova_metadata_ips))) set(cfg.CONF.nsxv.nova_metadata_ips)))
m_ip_to_set = (list(set(cfg.CONF.nsxv.nova_metadata_ips) m_ip_to_set = (list(set(cfg.CONF.nsxv.nova_metadata_ips)
- set(m_ips))) - set(m_ips)))
if m_to_convert or m_ip_to_set:
update_md_proxy = True
for m_ip in m_to_convert: for m_ip in m_to_convert:
m_name = md_members[m_ip] m_name = md_members[m_ip]
vs.default_pool.members[m_name].payload['ipAddress'] = ( vs.default_pool.members[m_name].payload['ipAddress'] = (
@ -380,7 +382,9 @@ class NsxVMetadataProxyHandler(object):
try: try:
# This may fail if the edge is powered off right now # This may fail if the edge is powered off right now
lb_obj.submit_to_backend(self.nsxv_plugin.nsx_v.vcns, edge_id) if update_md_proxy:
lb_obj.submit_to_backend(self.nsxv_plugin.nsx_v.vcns,
edge_id)
except exceptions.RequestBad as e: except exceptions.RequestBad as e:
# log the error and continue # log the error and continue
LOG.error("Failed to update load balancer on metadata " LOG.error("Failed to update load balancer on metadata "