diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py index 4d64f3edd4..5c66047a88 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py @@ -132,6 +132,11 @@ def parse_config(): cfg.CONF.set_override( 'api_extensions_path', '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 diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/common/metadata_access.py b/quantum/plugins/nicira/nicira_nvp_plugin/common/metadata_access.py index f3a07aea73..81fdf66e54 100644 --- a/quantum/plugins/nicira/nicira_nvp_plugin/common/metadata_access.py +++ b/quantum/plugins/nicira/nicira_nvp_plugin/common/metadata_access.py @@ -117,6 +117,10 @@ class NvpMetadataAccess(object): if not cfg.CONF.NVP.enable_metadata_access_network: LOG.debug(_("Metadata access network is disabled")) 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 # this query will return only 'real' router interfaces ctx_elevated = context.elevated()