From 94b91ee461e0c15239e8f9f66fec88ff07463d43 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 13 Aug 2013 09:04:50 -0700 Subject: [PATCH] Remove references to enable_metadata_access_network_option Bug 1211850 This configuration variable is vestigial and not used anywhere in the code. References to it should be removed to avoid confusion. Change-Id: I13f86fe8b964c163324160b4c983e773e6b93e40 --- etc/neutron/plugins/nicira/nvp.ini | 3 --- neutron/plugins/nicira/check_nvp_config.py | 2 -- neutron/plugins/nicira/common/config.py | 3 --- 3 files changed, 8 deletions(-) diff --git a/etc/neutron/plugins/nicira/nvp.ini b/etc/neutron/plugins/nicira/nvp.ini index 7f74e2948..77bf026c5 100644 --- a/etc/neutron/plugins/nicira/nvp.ini +++ b/etc/neutron/plugins/nicira/nvp.ini @@ -88,8 +88,5 @@ # namespaces otherwise access_network should be used. # metadata_mode = access_network -# Enables dedicated connection to the metadata proxy for metadata server access via Neutron router -# enable_metadata_access_network = true - # The default network transport type to use (stt, gre, bridge, ipsec_gre, or ipsec_stt) # default_transport_type = stt diff --git a/neutron/plugins/nicira/check_nvp_config.py b/neutron/plugins/nicira/check_nvp_config.py index c33ef1af4..d65d47e05 100644 --- a/neutron/plugins/nicira/check_nvp_config.py +++ b/neutron/plugins/nicira/check_nvp_config.py @@ -65,8 +65,6 @@ def main(argv): cfg.CONF.NVP.concurrent_connections) print "\tmax_lp_per_bridged_ls: %s" % cfg.CONF.NVP.max_lp_per_bridged_ls print "\tmax_lp_per_overlay_ls: %s" % cfg.CONF.NVP.max_lp_per_overlay_ls - print ("\tenable_metadata_access_network: %s" % - cfg.CONF.NVP.enable_metadata_access_network) print "------------------------ Cluster Options ------------------------" print "\trequested_timeout: %s" % cfg.CONF.req_timeout print "\tretries: %s" % cfg.CONF.retries diff --git a/neutron/plugins/nicira/common/config.py b/neutron/plugins/nicira/common/config.py index 6d2d74f3b..a6fe73ca2 100644 --- a/neutron/plugins/nicira/common/config.py +++ b/neutron/plugins/nicira/common/config.py @@ -36,9 +36,6 @@ nvp_opts = [ "This option is only useful if running on a host that " "does not support namespaces otherwise access_network " "should be used.")), - cfg.BoolOpt('enable_metadata_access_network', default=True, - help=_("Enables dedicated connection to the metadata proxy " - "for metadata server access via Neutron router")), cfg.StrOpt('default_transport_type', default='stt', help=_("The default network tranport type to use (stt, gre, " "bridge, ipsec_gre, or ipsec_stt)")), -- 2.45.2