Align default value notation in configuration files

Fixes bug 1185712

Change-Id: Id17779f8f464fcaf36bbab9f84c29e35d86214b7

etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini

@@ -30,7 +30,7 @@ reconnect_interval = 2
 # to 'vlan' and configure network_vlan_ranges below or to 'flat'.
 # Set to 'none' to disable creation of tenant networks.
 #
-# Default: tenant_network_type = local
+# tenant_network_type = local
 # Example: tenant_network_type = vlan
 
 # (ListOpt) Comma-separated list of
@@ -41,12 +41,12 @@ reconnect_interval = 2
 # available for tenant network allocation if tenant_network_type is
 # 'vlan'. If empty, only gre and local networks may be created.
 #
-# Default: network_vlan_ranges =
+# network_vlan_ranges =
 # Example: network_vlan_ranges = physnet1:1000:2999
 
 [AGENT]
 # Agent's polling interval in seconds
-polling_interval = 2
+# polling_interval = 2
 
 # (ListOpt) Comma separated list of <physical_network>:<vswitch>
 # where the physical networks can be expressed with wildcards,
@@ -56,12 +56,12 @@ polling_interval = 2
 # If a given physical network name will not match any value in the list
 # the plugin will look for a virtual switch with the same name.
 #
-# Default: physical_network_vswitch_mappings = *:external
+# physical_network_vswitch_mappings = *:external
 # Example: physical_network_vswitch_mappings = net1:external1,net2:external2
 
 # (StrOpt) Private virtual switch name used for local networking.
 #
-# Default: local_network_vswitch = private
+# local_network_vswitch = private
 # Example: local_network_vswitch = custom_vswitch
 
 #-----------------------------------------------------------------------------

etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini

@@ -6,7 +6,7 @@
 # networks to provide connectivity between hosts. Set to 'none' to
 # disable creation of tenant networks.
 #
-# Default: tenant_network_type = local
+# tenant_network_type = local
 # Example: tenant_network_type = vlan
 
 # (ListOpt) Comma-separated list of
@@ -17,7 +17,7 @@
 # available for tenant network allocation if tenant_network_type is
 # 'vlan'. If empty, only local networks may be created.
 #
-# Default: network_vlan_ranges =
+# network_vlan_ranges =
 # Example: network_vlan_ranges = physnet1:1000:2999
 
 [DATABASE]
@@ -53,19 +53,20 @@ reconnect_interval = 2
 # networks listed in network_vlan_ranges on the server should have
 # mappings to appropriate interfaces on each agent.
 #
-# Default: physical_interface_mappings =
+# physical_interface_mappings =
 # Example: physical_interface_mappings = physnet1:eth1
 
 [AGENT]
 # Agent's polling interval in seconds
-polling_interval = 2
+# polling_interval = 2
 
 # (BoolOpt) Enable server RPC compatibility with old (pre-havana)
 # agents.
 #
-# Default: rpc_support_old_agents = True
+# rpc_support_old_agents = True
 # Example: rpc_support_old_agents = False
 
 [SECURITYGROUP]
 # Firewall driver for realizing quantum security group function
-firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
+# firewall_driver = quantum.agent.firewall.NoopFirewallDriver
+# Example: firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver

etc/quantum/plugins/ml2/ml2_conf.ini

@@ -2,62 +2,62 @@
 # (StrOpt) SQLAlchemy database connection string. This MUST be changed
 # to actually run the plugin with persistent storage.
 #
-# Default: sql_connection = sqlite://
+# sql_connection = sqlite://
 # Example: sql_connection = mysql://root:password@localhost/quantum_ml2?charset=utf8
 
 # (IntOpt) Database reconnection retry limit after database
 # connectivity is lost. Value of -1 specifies infinite retry limit.
 #
-# Default: sql_max_retries = -1
+# sql_max_retries = -1
 # Example: sql_max_retries = 10
 
 # (IntOpt) Database reconnection interval in seconds after the initial
 # connection to the database fails.
 #
-# Default: reconnect_interval = 2
+# reconnect_interval = 2
 # Example: reconnect_interval = 10
 
 # (BoolOpt) 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.
 #
-# Default: sql_dbpool_enable = False
+# sql_dbpool_enable = False
 # Example: sql_dbpool_enable = True
 
 # (IntOpt) Minimum number of MySQL connections to keep open in a pool.
 #
-# Default: sql_min_pool_size = 1
+# sql_min_pool_size = 1
 # Example: sql_min_pool_size = 5
 
 # (IntOpt) Maximum number of MySQL connections to keep open in a pool.
 #
-# Default: sql_max_pool_size = 5
+# sql_max_pool_size = 5
 # Example: sql_max_pool_size = 20
 
 # (IntOpt) Timeout in seconds before idle MySQL connections are
 # reaped.
 #
-# Default: sql_idle_timeout = 3600
+# sql_idle_timeout = 3600
 # Example: sql_idle_timeout = 6000
 
 # (IntOpt) Maximum number of SQL connections to keep open in a
 # QueuePool in SQLAlchemy.
 #
-# Default: sqlalchemy_pool_size = 5
+# sqlalchemy_pool_size = 5
 # Example: sqlalchemy_pool_size = 10
 
 [ml2]
 # (ListOpt) List of network type driver entrypoints to be loaded from
 # the quantum.ml2.type_drivers namespace.
 #
-# Default: type_drivers = local,flat,vlan
+# type_drivers = local,flat,vlan
 # Example: type_drivers = flat,vlan,gre
 
 # (ListOpt) Ordered list of network_types to allocate as tenant
 # networks. The default value 'local' is useful for single-box testing
 # but provides no connectivity between hosts.
 #
-# Default: tenant_network_types = local
+# tenant_network_types = local
 # Example: tenant_network_types = vlan,gre
 
 [ml2_type_flat]
@@ -65,7 +65,7 @@
 # can be created. Use * to allow flat networks with arbitrary
 # physical_network names.
 #
-# Default:flat_networks =
+# flat_networks =
 # Example:flat_networks = physnet1,physnet2
 # Example:flat_networks = *
 
@@ -75,5 +75,5 @@
 # tenant networks, as well as ranges of VLAN tags on each
 # physical_network available for allocation as tenant networks.
 #
-# Default: network_vlan_ranges =
+# network_vlan_ranges =
 # Example: network_vlan_ranges = physnet1:1000:2999,physnet2

etc/quantum/plugins/mlnx/mlnx_conf.ini

@@ -4,7 +4,7 @@
 # in order for tenant networks to provide connectivity between hosts.
 # Set to 'none' to disable creation of tenant networks.
 #
-# Default: tenant_network_type = vlan
+# tenant_network_type = vlan
 # Example: tenant_network_type = vlan
 
 # (ListOpt) Comma-separated list of
@@ -15,7 +15,7 @@
 # available for tenant network allocation if tenant_network_type is
 # 'vlan'. If empty, only local networks may be created.
 #
-# Default: network_vlan_ranges =
+# network_vlan_ranges =
 # Example: network_vlan_ranges = default:1:100
 
 [DATABASE]
@@ -29,7 +29,7 @@ sql_connection = sqlite://
 # set to -1 implies an infinite retry count
 # sql_max_retries = 10
 # Database reconnection interval in seconds - in event connectivity is lost
-reconnect_interval = 2
+# reconnect_interval = 2
 
 [ESWITCH]
 # (ListOpt) Comma-separated list of
@@ -39,21 +39,21 @@ reconnect_interval = 2
 # networks listed in network_vlan_ranges on the server should have
 # mappings to appropriate interfaces on each agent.
 #
-# Default: physical_interface_mappings =
+# physical_interface_mappings =
 # Example: physical_interface_mappings = default:eth2
 
 # (StrOpt) Type of Network Interface to allocate for VM:
 # direct or hosdev according to libvirt terminology
-# Default: vnic_type = direct
+# vnic_type = direct
 
 # (StrOpt) Eswitch daemon end point connection url
-# Default: daemon_endpoint = 'tcp://127.0.0.1:5001'
+# daemon_endpoint = 'tcp://127.0.0.1:5001'
 
 # The number of milliseconds the agent will wait for
 # response on request to daemon
-# Default: request_timeout = 3000
+# request_timeout = 3000
 
 
 [AGENT]
 # Agent's polling interval in seconds
-polling_interval = 2
+# polling_interval = 2

etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini

@@ -32,7 +32,7 @@ reconnect_interval = 2
 # networks to provide connectivity between hosts. Set to 'none' to
 # disable creation of tenant networks.
 #
-# Default: tenant_network_type = local
+# tenant_network_type = local
 # Example: tenant_network_type = gre
 
 # (ListOpt) Comma-separated list of
@@ -43,20 +43,20 @@ reconnect_interval = 2
 # available for tenant network allocation if tenant_network_type is
 # 'vlan'. If empty, only gre and local networks may be created.
 #
-# Default: network_vlan_ranges =
+# network_vlan_ranges =
 # Example: network_vlan_ranges = physnet1:1000:2999
 
 # (BoolOpt) Set to True in the server and the agents to enable support
 # for GRE networks. Requires kernel support for OVS patch ports and
 # GRE tunneling.
 #
-# Default: enable_tunneling = False
+# enable_tunneling = False
 
 # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples
 # enumerating ranges of GRE tunnel IDs that are available for tenant
 # network allocation if tenant_network_type is 'gre'.
 #
-# Default: tunnel_id_ranges =
+# tunnel_id_ranges =
 # Example: tunnel_id_ranges = 1:1000
 
 # Do not change this parameter unless you have a good reason to.
@@ -65,12 +65,12 @@ reconnect_interval = 2
 # attached to this bridge and then "patched" according to their network
 # connectivity.
 #
-# Default: integration_bridge = br-int
+# integration_bridge = br-int
 
 # Only used for the agent if tunnel_id_ranges (above) is not empty for
 # the server.  In most cases, the default value should be fine.
 #
-# Default: tunnel_bridge = br-tun
+# tunnel_bridge = br-tun
 
 # Peer patch port in integration bridge for tunnel bridge
 # int_peer_patch_port = patch-tun
@@ -82,7 +82,7 @@ reconnect_interval = 2
 # empty for the server. Set local-ip to be the local IP address of
 # this hypervisor.
 #
-# Default: local_ip =
+# local_ip =
 
 # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
 # mapping physical network names to the agent's node-specific OVS
@@ -92,16 +92,17 @@ reconnect_interval = 2
 # port. All physical networks listed in network_vlan_ranges on the
 # server should have mappings to appropriate bridges on each agent.
 #
-# Default: bridge_mappings =
+# bridge_mappings =
 # Example: bridge_mappings = physnet1:br-eth1
 
 [AGENT]
 # Agent's polling interval in seconds
-polling_interval = 2
+# polling_interval = 2
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
+# Firewall driver for realizing quantum security group function.
-# firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+# firewall_driver = quantum.agent.firewall.NoopFirewallDriver
+# Example: firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 
 #-----------------------------------------------------------------------------
 # Sample Configurations.