Allow use of lowercase section names in conf files

Fixes bug #1189889

oslo.config-1.2.0 normalizes section names in config files to lowercase.
This means that simply by upgrading to oslo.config-1.2.0, users will now
be able to do e.g.

  [default_servicetype]
  description = ...
  service_definition = ...

Change the default config files to make it clear we recommend the use of
lowercase section names.

Note, the use of an alpha tarball of oslo.config requires pbr>=0.5.15
but we already require >=0.5.16.

DocImpact

Change-Id: Ia47fb3d168da71d3221b25979f8c9257d70dd64d
This commit is contained in:
Mark McLoughlin 2013-06-18 11:44:06 +01:00
parent a0f8d5a354
commit fd7223bcd4
23 changed files with 72 additions and 68 deletions

View File

@ -263,7 +263,7 @@ notification_topics = notifications
#ssl_ca_file = /path/to/cafile
# ======== end of WSGI parameters related to the API server ==========
[QUOTAS]
[quotas]
# resource name(s) that are supported in quota features
# quota_items = network,subnet,port
@ -288,7 +288,7 @@ notification_topics = notifications
# default driver to use for quota checks
# quota_driver = quantum.quota.ConfDriver
[DEFAULT_SERVICETYPE]
[default_servicetype]
# Description of the default service type (optional)
# description = "default service type"
# Enter a service definition line for each advanced service provided
@ -296,7 +296,7 @@ notification_topics = notifications
# Each service definition should be in the following format:
# <service>:<plugin>[:driver]
[AGENT]
[agent]
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
@ -318,7 +318,7 @@ admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
signing_dir = /var/lib/quantum/keystone-signing
[LBAAS]
[lbaas]
# ==================================================================================================
# driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin
# ==================================================================================================

View File

@ -1,6 +1,6 @@
# Config file for quantum-proxy-plugin.
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
@ -29,7 +29,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[RESTPROXY]
[restproxy]
# All configuration for this plugin is in section '[restproxy]'
#
# The following parameters are supported:
@ -45,7 +45,7 @@ servers=localhost:8080
#sync_data=True
#server_timeout=10
[NOVA]
[nova]
# Specify the VIF_TYPE that will be controlled on the Nova compute instances
# options: ivs or ovs
# default: ovs

View File

@ -1,4 +1,4 @@
[SWITCH]
[switch]
# username = <mgmt admin username>
# password = <mgmt admin password>
# address = <switch mgmt ip address>
@ -10,7 +10,7 @@
# address = 10.24.84.38
# ostype = NOS
[DATABASE]
[database]
# sql_connection = sqlite://
# Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
# sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
@ -31,23 +31,23 @@
# Example:
# sql_connection = mysql://root:pass@localhost/brcd_quantum?charset=utf8
[PHYSICAL_INTERFACE]
[physical_interface]
# physical_interface = <physical network name>
#
# Example:
# physical_interface = physnet1
[VLANS]
[vlans]
# network_vlan_ranges = <physical network name>:nnnn:mmmm
#
# Example:
# network_vlan_ranges = physnet1:1000:2999
[AGENT]
[agent]
# Example:
# root_helper = sudo /usr/local/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
[LINUX_BRIDGE]
[linux_bridge]
# physical_interface_mappings = <physical network name>:<local interface>
#
# Example:

View File

@ -1,8 +1,8 @@
[CISCO_PLUGINS]
[cisco_plugins]
#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin
#vswitch_plugin=quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2
[CISCO]
[cisco]
#vlan_start=100
#vlan_end=3000
#vlan_name_prefix=q-
@ -15,7 +15,7 @@
#svi_round_robin=False
# IMPORTANT: Comment out the following two lines for production deployments
[CISCO_TEST]
[cisco_test]
host=testhost
#
@ -34,7 +34,7 @@ host=testhost
# username=admin
# password=mySecretPassword
[DATABASE]
[database]
#
# This line MUST be changed to actually run the plugin.
# Example:

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://quantum:password@127.0.0.1:3306/hyperv_quantum
@ -27,7 +27,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[HYPERV]
[hyperv]
# (StrOpt) Type of network to allocate for tenant networks. The
# default value 'local' is useful only for single-box testing and
# provides no connectivity between hosts. You MUST either change this
@ -48,7 +48,7 @@ reconnect_interval = 2
# network_vlan_ranges =
# Example: network_vlan_ranges = physnet1:1000:2999
[AGENT]
[agent]
# Agent's polling interval in seconds
# polling_interval = 2

View File

@ -1,4 +1,4 @@
[VLANS]
[vlans]
# (StrOpt) Type of network to allocate for tenant networks. The
# default value 'local' is useful only for single-box testing and
# provides no connectivity between hosts. You MUST change this to
@ -20,7 +20,7 @@
# network_vlan_ranges =
# Example: network_vlan_ranges = physnet1:1000:2999
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
@ -49,7 +49,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[LINUX_BRIDGE]
[linux_bridge]
# (ListOpt) Comma-separated list of
# <physical_network>:<physical_interface> tuples mapping physical
# network names to the agent's node-specific physical network
@ -60,7 +60,7 @@ reconnect_interval = 2
# physical_interface_mappings =
# Example: physical_interface_mappings = physnet1:eth1
[AGENT]
[agent]
# Agent's polling interval in seconds
# polling_interval = 2
@ -70,7 +70,7 @@ reconnect_interval = 2
# rpc_support_old_agents = True
# Example: rpc_support_old_agents = False
[SECURITYGROUP]
[securitygroup]
# Firewall driver for realizing quantum security group function
# firewall_driver = quantum.agent.firewall.NoopFirewallDriver
# Example: firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
@ -29,7 +29,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[META]
[meta]
## This is list of flavor:quantum_plugins
# extension method is used in the order of this list
plugin_list= 'openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2'

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
@ -27,7 +27,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[MIDONET]
[midonet]
# MidoNet API server URI
# midonet_uri = http://localhost:8080/midonet-api

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# (StrOpt) SQLAlchemy database connection string. This MUST be changed
# to actually run the plugin with persistent storage.
#

View File

@ -1,4 +1,4 @@
[MLNX]
[mlnx]
# (StrOpt) Type of network to allocate for tenant networks. The
# default value is 'vlan' You MUST configure network_vlan_ranges below
# in order for tenant networks to provide connectivity between hosts.
@ -18,7 +18,7 @@
# network_vlan_ranges =
# Example: network_vlan_ranges = default:1:100
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
@ -31,7 +31,7 @@ sql_connection = sqlite://
# Database reconnection interval in seconds - in event connectivity is lost
# reconnect_interval = 2
[ESWITCH]
[eswitch]
# (ListOpt) Comma-separated list of
# <physical_network>:<physical_interface> tuples mapping physical
# network names to the agent's node-specific physical network
@ -54,6 +54,6 @@ sql_connection = sqlite://
# request_timeout = 3000
[AGENT]
[agent]
# Agent's polling interval in seconds
# polling_interval = 2

View File

@ -1,6 +1,6 @@
# Sample Configurations
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
@ -29,7 +29,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[OVS]
[ovs]
# Do not change this parameter unless you have a good reason to.
# This is the name of the OVS integration bridge. There is one per hypervisor.
# The integration bridge acts as a virtual "patch port". All VM VIFs are
@ -37,7 +37,7 @@ reconnect_interval = 2
# connectivity.
integration_bridge = br-int
[AGENT]
[agent]
# Agent's polling interval in seconds
polling_interval = 2
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
@ -45,11 +45,11 @@ polling_interval = 2
# Change to "sudo" to skip the filtering and just run the comand directly
root_helper = sudo
[SECURITYGROUP]
[securitygroup]
# Firewall driver for realizing quantum security group function
firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
[OFC]
[ofc]
# Specify OpenFlow Controller Host, Port and Driver to connect.
host = 127.0.0.1
port = 8888

View File

@ -7,9 +7,9 @@
# Remarks: Use 'enable_isolated_metadata' in dhcp_agent.ini.
#
#
# Section: [CLUSTER:name], Option: 'nvp_controller_connection'
# Section: [cluster:name], Option: 'nvp_controller_connection'
# Remarks: The configuration will allow the specification of
# a single cluster, therefore [CLUSTER:name] is no
# a single cluster, therefore [cluster:name] is no
# longer used. Use 'nvp_*', options, 'req_timeout',
# 'retries', etc. as indicated in the DEFAULT section.
# Support for multiple clusters will be added through
@ -62,7 +62,7 @@
# default_iface_name = breth0
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
@ -99,12 +99,12 @@ sql_connection = sqlite://
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[QUOTAS]
[quotas]
# number of network gateways allowed per tenant, -1 means unlimited
# quota_network_gateway = 5
[NVP]
[nvp]
# Maximum number of ports for each bridged logical switch
# max_lp_per_bridged_ls = 64

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
@ -27,7 +27,7 @@ reconnect_interval = 2
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[OVS]
[ovs]
# (StrOpt) Type of network to allocate for tenant networks. The
# default value 'local' is useful only for single-box testing and
# provides no connectivity between hosts. You MUST either change this
@ -100,7 +100,7 @@ reconnect_interval = 2
# bridge_mappings =
# Example: bridge_mappings = physnet1:br-eth1
[AGENT]
[agent]
# Agent's polling interval in seconds
# polling_interval = 2
@ -119,7 +119,7 @@ reconnect_interval = 2
# vxlan_udp_port =
# Example: vxlan_udp_port = 8472
[SECURITYGROUP]
[securitygroup]
# Firewall driver for realizing quantum security group function.
# firewall_driver = quantum.agent.firewall.NoopFirewallDriver
# Example: firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

View File

@ -1,6 +1,6 @@
# Config file for Quantum PLUMgrid plugin
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
@ -29,7 +29,7 @@
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[PLUMgridNOS]
[plumgridnos]
# This line should be pointing to the NOS server,
# for the PLUMgrid platform. In other deployments,
# this is known as controller

View File

@ -1,4 +1,4 @@
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
#sql_connection = mysql://<user>:<pass>@<IP>:<port>/<dbname>
@ -19,7 +19,7 @@ sql_connection = sqlite://
# Timeout of the open connections QueuePool in SQLAlchemy
# Example sqlalchemy_pool_timeout = 30
[OVS]
[ovs]
integration_bridge = br-int
# openflow_rest_api = <host IP address of ofp rest api service>:<port: 8080>
@ -52,10 +52,10 @@ tunnel_interface = eth0
# ovsdb_interface =
ovsdb_interface = eth0
[SECURITYGROUP]
[securitygroup]
# Firewall driver for realizing quantum security group function
# firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
[AGENT]
[agent]
# Agent's polling interval in seconds
polling_interval = 2

View File

@ -6,7 +6,7 @@ flavor:network corresponds to specific l2 plugin ( flavor-plugin mapping could b
flavor:router corresponds to specific l3 plugin ( flavor-plugin mapping could be configureable by l3_plugin_list config. Note that Metaplugin can provide l3 functionaliteis for l2 plugin which didn't support l3 extension yet.
This plugin also support extensions. We can map extension to plugin by using extension_map config.
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
@ -20,7 +20,7 @@ sql_connection = mysql://root:password@localhost/quantum_metaplugin?charset=utf8
# Database reconnection interval in seconds - in event connectivity is lost
reconnect_interval = 2
[META]
[meta]
## This is list of flavor:quantum_plugins
# extension method is used in the order of this list
plugin_list= 'openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2'
@ -47,7 +47,7 @@ meta_flavor_driver_mappings = openvswitch:quantum.agent.linux.interface.OVSInter
# interface driver for MetaPlugin
interface_driver = quantum.agent.linux.interface.MetaInterfaceDriver
[Proxy]
[proxy]
auth_url = http://10.0.0.1:35357/v2.0
auth_region = RegionOne
admin_tenant_name = service

View File

@ -120,6 +120,10 @@ def register_deprecated(conf):
for parsed_file in multi_parser.parsed:
for section in parsed_file.keys():
if section not in conf and section.startswith("CLUSTER:"):
if not section.lower().startswith("cluster:"):
continue
section = 'CLUSTER:' + section.split(':', 1)[1]
if section not in conf:
conf.register_opts(cluster_opts + [controller_depr], section)
# ### END

View File

@ -22,10 +22,10 @@ rpc_backend = quantum.openstack.common.rpc.impl_fake
lock_path = $state_path/lock
[DATABASE]
[database]
sql_connection = 'sqlite:///:memory:'
[DEFAULT_SERVICETYPE]
[default_servicetype]
description = "default service type"
service_definition=dummy:quantum.tests.unit.dummy_plugin.QuantumDummyPlugin

View File

@ -1,6 +1,6 @@
# Test config file for quantum-proxy-plugin.
[DATABASE]
[database]
# This line MUST be changed to actually run the plugin.
# Example:
# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
@ -13,7 +13,7 @@ sql_connection = sqlite://
# Database reconnection interval in seconds - in event connectivity is lost
reconnect_interval = 2
[RESTPROXY]
[restproxy]
# All configuration for this plugin is in section '[restproxy]'
#
# The following parameters are supported:
@ -25,7 +25,7 @@ servers=localhost:8899
serverssl=False
#serverauth=username:password
[NOVA]
[nova]
# Specify the VIF_TYPE that will be controlled on the Nova compute instances
# options: ivs or ovs
# default: ovs

View File

@ -1,4 +1,4 @@
[MIDONET]
[midonet]
# MidoNet API server URI
midonet_uri = http://localhost:8080/midonet-api

View File

@ -1,7 +1,7 @@
[DEFAULT]
metadata_dhcp_host_route = False
[CLUSTER:fake]
[cluster:fake]
default_tz_uuid = fake_tz_uuid
nova_zone_id = whatever
nvp_cluster_uuid = fake_cluster_uuid

View File

@ -22,10 +22,10 @@ rpc_backend = quantum.openstack.common.rpc.impl_fake
lock_path = $state_path/lock
[DATABASE]
[database]
sql_connection = 'sqlite:///:memory:'
[DEFAULT_SERVICETYPE]
[default_servicetype]
description = "default service type"
service_definition=dummy:quantum.tests.unit.dummy_plugin.QuantumDummyPlugin

View File

@ -18,7 +18,7 @@ sqlalchemy>=0.7.8,<=0.7.99
WebOb>=1.2
python-keystoneclient>=0.2.0
alembic>=0.4.1
oslo.config>=1.1.0
http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a2.tar.gz#egg=oslo.config-1.2.0a2
six
stevedore>=0.9