x/vmware-nsx
Code Issues Proposed changes

NSX|V: ensure that metadata works with 'internal' ipam

Browse Source 
Commit 625de54de3936b0da8760c3da76d2d315d05f94e changed the
default behaviors of IPAM in neutron. This caused the metadata
service initialization to hang.

Change-Id: Ia3ff8ca9db6bcb971caa90c87edad6430c233e5e
This commit is contained in:
Gary Kotton 2016-08-17 22:57:12 -07:00 committed by garyk
parent 880d0f3fa5
commit 4be367da5d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -224,15 +224,6 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
callbacks_resources.QOS_POLICY) callbacks_resources.QOS_POLICY)
self._start_rpc_listeners() self._start_rpc_listeners()
has_metadata_cfg = (
cfg.CONF.nsxv.nova_metadata_ips
and cfg.CONF.nsxv.mgt_net_moid
and cfg.CONF.nsxv.mgt_net_proxy_ips
and cfg.CONF.nsxv.mgt_net_proxy_netmask)
if has_metadata_cfg:
self.metadata_proxy_handler = (
nsx_v_md_proxy.NsxVMetadataProxyHandler(self))
# Service insertion driver register # Service insertion driver register
self._si_handler = fc_utils.NsxvServiceInsertionHandler(self) self._si_handler = fc_utils.NsxvServiceInsertionHandler(self)
registry.subscribe(self.add_vms_to_service_insertion, registry.subscribe(self.add_vms_to_service_insertion,
@ -243,6 +234,15 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
self.supported_extension_aliases.append("provider-security-group") self.supported_extension_aliases.append("provider-security-group")
def init_complete(self, resource, event, trigger, **kwargs): def init_complete(self, resource, event, trigger, **kwargs):
has_metadata_cfg = (
cfg.CONF.nsxv.nova_metadata_ips
and cfg.CONF.nsxv.mgt_net_moid
and cfg.CONF.nsxv.mgt_net_proxy_ips
and cfg.CONF.nsxv.mgt_net_proxy_netmask)
if has_metadata_cfg:
self.metadata_proxy_handler = (
nsx_v_md_proxy.NsxVMetadataProxyHandler(self))
self.init_is_complete = True self.init_is_complete = True
def add_vms_to_service_insertion(self, sg_id): def add_vms_to_service_insertion(self, sg_id):