Merge "Remove references to enable_metadata_access_network_option"
This commit is contained in:
commit
16cb7d23a1
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)")),
|
||||
|
Loading…
Reference in New Issue
Block a user