From: ZhiQiang Fan Date: Mon, 29 Jul 2013 10:40:46 +0000 (+0800) Subject: Avoid overwrite value of deprecated name in conf. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3313448f2de1ce288944af101a794d706fd43abb;p=openstack-build%2Fneutron-build.git Avoid overwrite value of deprecated name in conf. See bug/1194064 #2 Mark McLoughlin's comment Fixes: Bug #1194064 Change-Id: I421d2decfa8829796fe7b6c14f954f3cccc17215 --- diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini index 3485aed7f..94222da28 100644 --- a/etc/l3_agent.ini +++ b/etc/l3_agent.ini @@ -7,11 +7,13 @@ # OVS based plugins (OVS, Ryu, NEC) that supports L3 agent interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + # OVS based plugins(Ryu, NEC) that use OVS # as OpenFlow switch and check port status -#ovs_use_veth = True +# ovs_use_veth = True + # LinuxBridge -#interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver +# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and # iproute2 package that supports namespaces). diff --git a/etc/lbaas_agent.ini b/etc/lbaas_agent.ini index 7e9adde75..c95e0be9d 100644 --- a/etc/lbaas_agent.ini +++ b/etc/lbaas_agent.ini @@ -9,15 +9,17 @@ # OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight) interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS # as OpenFlow switch and check port status # ovs_use_veth = True + # LinuxBridge # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver # The agent requires a driver to manage the loadbalancer. HAProxy is the # opensource version. -#device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver +# device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver # The user group # user_group = nogroup diff --git a/etc/neutron.conf b/etc/neutron.conf index d5e59b269..8cdaa1d65 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -32,10 +32,10 @@ lock_path = $state_path/lock # publish_errors = False # Address to bind the API server -bind_host = 0.0.0.0 +# bind_host = 0.0.0.0 # Port the bind the API server to -bind_port = 9696 +# bind_port = 9696 # Path to the extensions. Note that this can be a colon-separated list of # paths. For example: @@ -51,7 +51,7 @@ bind_port = 9696 # service_plugins = # Paste configuration file -api_paste_config = api-paste.ini +# api_paste_config = api-paste.ini # The strategy to be used for auth. # Supported values are 'keystone'(default), 'noauth'. @@ -184,7 +184,7 @@ api_paste_config = api-paste.ini notification_driver = neutron.openstack.common.notifier.rpc_notifier # default_notification_level is used to form actual topic name(s) or to set logging level -default_notification_level = INFO +# default_notification_level = INFO # default_publisher_id is a part of the notification payload # host = myhost.com @@ -192,7 +192,7 @@ default_notification_level = INFO # Defined in rpc_notifier, can be comma separated values. # The actual topic names will be %s.%(default_notification_level)s -notification_topics = notifications +# notification_topics = notifications # Default maximum number of items returned in a single response, # value == infinite and value < 0 means no max limit, and value must @@ -241,28 +241,28 @@ notification_topics = notifications # =========== WSGI parameters related to the API server ============== # Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when # starting API server. Not supported on OS X. -#tcp_keepidle = 600 +# tcp_keepidle = 600 # Number of seconds to keep retrying to listen -#retry_until_window = 30 +# retry_until_window = 30 # Number of backlog requests to configure the socket with. -#backlog = 4096 +# backlog = 4096 # Enable SSL on the API server -#use_ssl = False +# use_ssl = False # Certificate file to use when starting API server securely -#ssl_cert_file = /path/to/certfile +# ssl_cert_file = /path/to/certfile # Private key file to use when starting API server securely -#ssl_key_file = /path/to/keyfile +# ssl_key_file = /path/to/keyfile # CA certificate file to use when starting API server securely to # verify connecting clients. This is an optional parameter only required if # API clients need to authenticate to the API server using SSL certificates # signed by a trusted CA -#ssl_ca_file = /path/to/cafile +# ssl_ca_file = /path/to/cafile # ======== end of WSGI parameters related to the API server ========== [quotas] @@ -316,7 +316,7 @@ signing_dir = $state_path/keystone-signing # ================================================================================================== # driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin # ================================================================================================== -#driver_fqn = neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver +# driver_fqn = neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver [database] # This line MUST be changed to actually run the plugin. @@ -365,6 +365,6 @@ signing_dir = $state_path/keystone-signing # List of allowed service type include LOADBALANCER, FIREWALL, VPN # Combination of and must be unique; must also be unique # this is multiline option, example for default provider: -#service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default +# service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default # example of non-default provider: -#service_provider=FIREWALL:name2:firewall_driver_path +# service_provider=FIREWALL:name2:firewall_driver_path diff --git a/etc/neutron/plugins/bigswitch/restproxy.ini b/etc/neutron/plugins/bigswitch/restproxy.ini index 970e88666..9c2a83a34 100644 --- a/etc/neutron/plugins/bigswitch/restproxy.ini +++ b/etc/neutron/plugins/bigswitch/restproxy.ini @@ -9,12 +9,30 @@ # server_ssl : True | False (default: False) # sync_data : True | False (default: False) # server_timeout : 10 (default: 10 seconds) +# neutron_id: (default: neutron-) +# add_meta_server_route: True | False (default: True) # + +# A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Note that only one server is needed per deployment, but you may wish to deploy multiple servers to support failover. servers=localhost:8080 -#server_auth=username:password -#server_ssl=True -#sync_data=True -#server_timeout=10 + +# The username and password for authenticating against the BigSwitch or Floodlight controller. +# server_auth=username:password + +# If True, Use SSL when connecting to the BigSwitch or Floodlight controller. +# server_ssl=True + +# Sync data on connect +# sync_data=True + +# Maximum number of seconds to wait for proxy request to connect and complete. +# server_timeout=10 + +# User defined identifier for this Neutron deployment +# neutron_id = + +# Flag to decide if a route to the metadata server should be injected into the VM +# add_meta_server_route = True [nova] # Specify the VIF_TYPE that will be controlled on the Nova compute instances @@ -37,7 +55,8 @@ servers=localhost:8080 # Optionally, a comma-separated list of nexthops may be included after # Use an * to specify default for all tenants # Default is any any allow for all tenants -#tenant_default_router_rule=*:any:any:permit +# tenant_default_router_rule=*:any:any:permit + # Maximum number of rules that a single router may have # Default is 200 -#max_router_rules=200 +# max_router_rules=200 diff --git a/etc/neutron/plugins/midonet/midonet.ini b/etc/neutron/plugins/midonet/midonet.ini index ebe228249..b4573a907 100644 --- a/etc/neutron/plugins/midonet/midonet.ini +++ b/etc/neutron/plugins/midonet/midonet.ini @@ -4,16 +4,16 @@ # midonet_uri = http://localhost:8080/midonet-api # MidoNet admin username -#username = admin +# username = admin # MidoNet admin password -#password = passw0rd +# password = passw0rd # ID of the project that MidoNet admin user belongs to -#project_id = 77777777-7777-7777-7777-777777777777 +# project_id = 77777777-7777-7777-7777-777777777777 # Virtual provider router ID -#provider_router_id = 00112233-0011-0011-0011-001122334455 +# provider_router_id = 00112233-0011-0011-0011-001122334455 # Virtual metadata router ID -#metadata_router_id = ffeeddcc-ffee-ffee-ffee-ffeeddccbbaa +# metadata_router_id = ffeeddcc-ffee-ffee-ffee-ffeeddccbbaa diff --git a/etc/neutron/plugins/ml2/ml2_conf.ini b/etc/neutron/plugins/ml2/ml2_conf.ini index 25022a486..ba8e1dd58 100644 --- a/etc/neutron/plugins/ml2/ml2_conf.ini +++ b/etc/neutron/plugins/ml2/ml2_conf.ini @@ -1,4 +1,3 @@ - [ml2] # (ListOpt) List of network type driver entrypoints to be loaded from # the neutron.ml2.type_drivers namespace. @@ -43,3 +42,7 @@ # # network_vlan_ranges = # Example: network_vlan_ranges = physnet1:1000:2999,physnet2 + +[ml2_type_gre] +# (ListOpt) Comma-separated list of : tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation +# tunnel_id_ranges = diff --git a/etc/neutron/plugins/nec/nec.ini b/etc/neutron/plugins/nec/nec.ini index 810363931..cbcc0ec5c 100644 --- a/etc/neutron/plugins/nec/nec.ini +++ b/etc/neutron/plugins/nec/nec.ini @@ -6,11 +6,12 @@ # The integration bridge acts as a virtual "patch port". All VM VIFs are # attached to this bridge and then "patched" according to their network # connectivity. -integration_bridge = br-int +# integration_bridge = br-int [agent] # Agent's polling interval in seconds -polling_interval = 2 +# polling_interval = 2 + # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the comand directly @@ -22,10 +23,21 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal [ofc] # Specify OpenFlow Controller Host, Port and Driver to connect. -host = 127.0.0.1 -port = 8888 +# host = 127.0.0.1 +# port = 8888 + # Drivers are in neutron/plugins/nec/drivers/ . -driver = trema +# driver = trema + # PacketFilter is available when it's enabled in this configuration # and supported by the driver. -enable_packet_filter = true +# enable_packet_filter = true + +# Use SSL to connect +# use_ssl = false + +# Key file +# key_file = + +# Certificate file +# cert_file = diff --git a/etc/neutron/plugins/nicira/nvp.ini b/etc/neutron/plugins/nicira/nvp.ini index 781ed2630..7f74e2948 100644 --- a/etc/neutron/plugins/nicira/nvp.ini +++ b/etc/neutron/plugins/nicira/nvp.ini @@ -74,8 +74,12 @@ # max_lp_per_overlay_ls = 256 # Number of connects to each controller node. +# default is 5 # concurrent_connections = 3 +# Number of seconds a generation id should be valid for (default -1 meaning do not time out) +# nvp_gen_timeout = -1 + # Acceptable values for 'metadata_mode' are: # - 'access_network': this enables a dedicated connection to the metadata # proxy for metadata server access via Neutron router. @@ -84,5 +88,8 @@ # 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/etc/neutron/plugins/ryu/ryu.ini b/etc/neutron/plugins/ryu/ryu.ini index ed643b607..72abffef0 100644 --- a/etc/neutron/plugins/ryu/ryu.ini +++ b/etc/neutron/plugins/ryu/ryu.ini @@ -1,9 +1,8 @@ - [ovs] -integration_bridge = br-int +# integration_bridge = br-int # openflow_rest_api = : -openflow_rest_api = 127.0.0.1:8080 +# openflow_rest_api = 127.0.0.1:8080 # tunnel key range: 0 < tunnel_key_min < tunnel_key_max # VLAN: 12bits, GRE, VXLAN: 24bits @@ -38,4 +37,4 @@ ovsdb_interface = eth0 [agent] # Agent's polling interval in seconds -polling_interval = 2 +# polling_interval = 2