x/vmware-nsx
Code Issues Proposed changes

NVP plugin: configure metadata network only if overlapping IPs are enabled

Browse Source 
Bug 1152144

This patch also add a warning emitted in the logs at startup if the
configuration is not correct.

Change-Id: Idbf10c64f068a71ef1ed9c29a6a0c4e736bb975d
This commit is contained in:
Salvatore Orlando
2013-03-07 14:19:16 +01:00
parent bbbfdfe653
commit 9951582d33
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py
View File

@@ -132,6 +132,11 @@ def parse_config():
cfg.CONF.set_override( cfg.CONF.set_override(
'api_extensions_path', 'api_extensions_path',
'quantum/plugins/nicira/nicira_nvp_plugin/extensions') 'quantum/plugins/nicira/nicira_nvp_plugin/extensions')
if (cfg.CONF.NVP.enable_metadata_access_network and
not cfg.CONF.allow_overlapping_ips):
LOG.warn(_("Overlapping IPs must be enabled in order to setup "
"the metadata access network. Metadata access in "
"routed mode will not work with this configuration"))
return cfg.CONF.NVP, clusters_options return cfg.CONF.NVP, clusters_options

4
quantum/plugins/nicira/nicira_nvp_plugin/common/metadata_access.py
View File

@@ -117,6 +117,10 @@ class NvpMetadataAccess(object):
if not cfg.CONF.NVP.enable_metadata_access_network: if not cfg.CONF.NVP.enable_metadata_access_network:
LOG.debug(_("Metadata access network is disabled")) LOG.debug(_("Metadata access network is disabled"))
return return
if not cfg.CONF.allow_overlapping_ips:
LOG.warn(_("Overlapping IPs must be enabled in order to setup "
"the metadata access network"))
return
# As we'll use a different device_owner for metadata interface # As we'll use a different device_owner for metadata interface
# this query will return only 'real' router interfaces # this query will return only 'real' router interfaces
ctx_elevated = context.elevated() ctx_elevated = context.elevated()