Update the neutron.conf.erb according to the latest ver from upstream.

- Move the database section into neutron.conf from plugins
- Make the service_provider attribute configurable

Implements: blueprint neutron-ml2
Change-Id: Ia9e932a490e5c13ba49aa8358356e2fa640b845c

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file is used to list changes made in each version of cookbook-openstack-network.
 
+## 8.2.0
+* Move the database section into neutron.conf from plugins
+* Make the service_provider attribute configurable
+
 ## 8.1.1
 * allow dnsmasq source build to be optional
 

README.md

@@ -57,6 +57,8 @@ Identity-registration
 Attributes
 ==========
 
+* `openstack['openstack']['network']['service_provider']` - Array of service providers (drivers) for advanced services like loadbalancer, VPN, Firewall.
+
 TODO: Add DB2 support on other platforms
 * `openstack["network"]["platform"]["db2_python_packages"]` - Array of DB2 python packages, only available on redhat platform
 

attributes/default.rb

@@ -120,6 +120,18 @@ default['openstack']['network']['cron_replicate_dhcp'] = '*/1'
 # default by the main openstack-neutron package
 default['openstack']['network']['plugins'] = ['openvswitch', 'openvswitch-agent']
 
+# (ListOpt) Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall.
+# Must be in form:
+# service_provider=<service_type>:<name>:<driver>[:default]
+# List of allowed service type include LOADBALANCER, FIREWALL, VPN
+# Combination of <service type> and <name> must be unique; <driver> must also be unique
+# this is multiline option, example for default provider:
+# service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default
+# example of non-default provider:
+# service_provider=FIREWALL:name2:firewall_driver_path
+# --- Reference implementations ---
+default['openstack']['network']['service_provider'] = []
+
 # the core plugin to use for neutron
 default['openstack']['network']['core_plugin'] = 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2'
 

metadata.rb

@@ -5,7 +5,7 @@ maintainer        'Jay Pipes <jaypipes@gmail.com>'
 license           'Apache 2.0'
 description       'Installs and configures the OpenStack Network API Service and various agents and plugins'
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           '8.1.1'
+version           '8.2.0'
 recipe            'openstack-network::client', 'Install packages required for network client'
 recipe            'openstack-network::server', 'Installs packages required for a OpenStack Network server'
 recipe            'openstack-network::openvswitch', 'Installs packages required for OVS'
@@ -17,6 +17,6 @@ recipe            'openstack-network::identity_registration', 'Registers OpenSta
 end
 
 depends           'openstack-identity', '~> 8.0'
-depends           'openstack-common', '~> 8.0'
+depends           'openstack-common', '~> 8.2'
 depends           'mysql'
 depends           'postgresql'

recipes/common.rb

@@ -161,7 +161,8 @@ template '/etc/neutron/neutron.conf' do
     rabbit_pass: rabbit_pass,
     core_plugin: core_plugin,
     identity_endpoint: identity_endpoint,
-    service_pass: service_pass
+    service_pass: service_pass,
+    sql_connection: sql_connection
   )
 
   notifies :restart, 'service[neutron-server]', :delayed
@@ -208,9 +209,6 @@ when 'bigswitch'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -225,9 +223,6 @@ when 'brocade'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -242,9 +237,6 @@ when 'cisco'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -259,9 +251,6 @@ when 'hyperv'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -276,9 +265,6 @@ when 'linuxbridge'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -296,9 +282,6 @@ when 'midonet'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -313,9 +296,6 @@ when 'nec'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -330,9 +310,6 @@ when 'nicira'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -348,7 +325,6 @@ when 'openvswitch'
     group node['openstack']['network']['platform']['group']
     mode 00644
     variables(
-      sql_connection: sql_connection,
       local_ip: local_ip
     )
     notifies :create, "link[#{plugin_file}]", :immediately
@@ -367,9 +343,6 @@ when 'plumgrid'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed
@@ -384,9 +357,6 @@ when 'ryu'
     owner node['openstack']['network']['platform']['user']
     group node['openstack']['network']['platform']['group']
     mode 00644
-    variables(
-      sql_connection: sql_connection
-    )
 
     notifies :create, "link[#{plugin_file}]", :immediately
     notifies :restart, 'service[neutron-server]', :delayed

spec/linuxbridge_spec.rb

@@ -44,22 +44,6 @@ describe 'openstack-network::linuxbridge' do
       it 'has proper modes' do
         expect(sprintf('%o', @file.mode)).to eq '644'
       end
-
-      it 'has a correct sql_connection value' do
-        expect(@chef_run).to render_file(@file.name).with_content(
-          'mysql://neutron:neutron@127.0.0.1:3306/neutron')
-      end
-
-      it 'sets sqlalchemy attributes' do
-        expect(@chef_run).to render_file(@file.name).with_content(
-          'sql_dbpool_enable = False')
-        expect(@chef_run).to render_file(@file.name).with_content(
-          'sql_min_pool_size = 1')
-        expect(@chef_run).to render_file(@file.name).with_content(
-          'sql_max_pool_size = 5')
-        expect(@chef_run).to render_file(@file.name).with_content(
-          'sql_idle_timeout = 3600')
-      end
     end
   end
 end

spec/openvswitch_spec.rb

@@ -194,16 +194,5 @@ describe 'openstack-network::openvswitch' do
     it 'it uses local_ip from eth0 when local_ip_interface is set' do
       expect(@chef_run).to render_file(@file.name).with_content('local_ip = 10.0.0.3')
     end
-
-    it 'sets sqlalchemy attributes' do
-      expect(@chef_run).to render_file(@file.name).with_content(
-        'sql_dbpool_enable = False')
-      expect(@chef_run).to render_file(@file.name).with_content(
-        'sql_min_pool_size = 1')
-      expect(@chef_run).to render_file(@file.name).with_content(
-        'sql_max_pool_size = 5')
-      expect(@chef_run).to render_file(@file.name).with_content(
-        'sql_idle_timeout = 3600')
-    end
   end
 end

spec/server_spec.rb

@@ -9,6 +9,7 @@ describe 'openstack-network::server' do
       n.set['openstack']['mq']['host'] = '127.0.0.1'
       n.set['chef_client']['splay'] = 300
       n.set['openstack']['network']['quota']['driver'] = 'my.quota.Driver'
+      n.set['openstack']['network']['service_provider'] = ['provider1', 'provider2']
     end
     @chef_run.converge 'openstack-network::server'
   end
@@ -426,5 +427,42 @@ describe 'openstack-network::server' do
       chef_run.converge 'openstack-network::server'
       expect(chef_run).not_to create_file('/etc/sysconfig/neutron')
     end
+
+    describe 'database' do
+      it 'has a correct sql_connection value' do
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'mysql://neutron:neutron@127.0.0.1:3306/neutron')
+      end
+
+      it 'sets sqlalchemy attributes' do
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'slave_connection =')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'max_retries = 10')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'retry_interval = 10')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'min_pool_size = 1')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'max_pool_size = 10')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'idle_timeout = 3600')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'max_overflow = 20')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'connection_debug = 0')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'connection_trace = false')
+        expect(@chef_run).to render_file(@file.name).with_content(
+          'pool_timeout = 10')
+      end
+    end
+
+    it 'sets service_provider attributes' do
+      expect(@chef_run).to render_file(@file.name).with_content(
+        'service_provider = provider1')
+      expect(@chef_run).to render_file(@file.name).with_content(
+        'service_provider = provider2')
+    end
   end
 end

templates/default/neutron.conf.erb

@@ -325,4 +325,61 @@ admin_user = <%= node["openstack"]["network"]["service_user"] %>
 admin_password = <%= @service_pass %>
 signing_dir = <%= node["openstack"]["network"]["api"]["agent"]["signing_dir"] %>
 
+[database]
+# This line MUST be changed to actually run the plugin.
+# Example:
+# connection = mysql://root:nova@127.0.0.1:3306/neutron_linux_bridge
+# Replace 127.0.0.1 above with the IP address of the database used by the
+# main neutron server. (Leave it as is if the database runs on this host.)
+connection = <%= @sql_connection %>
+
+# The SQLAlchemy connection string used to connect to the slave database
+slave_connection = <%= node['openstack']['db']['network']['slave_connection'] %>
+
+# Database reconnection retry times - in event connectivity is lost
+# set to -1 implies an infinite retry count
+max_retries = <%= node['openstack']['db']['network']['max_retries'] %>
+
+# Database reconnection interval in seconds - if the initial connection to the
+# database fails
+retry_interval = <%= node['openstack']['db']['network']['retry_interval'] %>
+
+# Minimum number of SQL connections to keep open in a pool
+min_pool_size = <%= node['openstack']['db']['network']['min_pool_size'] %>
+
+# Maximum number of SQL connections to keep open in a pool
+max_pool_size = <%= node['openstack']['db']['network']['max_pool_size'] %>
+
+# Timeout in seconds before idle sql connections are reaped
+idle_timeout = <%= node['openstack']['db']['network']['idle_timeout'] %>
+
+# If set, use this value for max_overflow with sqlalchemy
+max_overflow = <%= node['openstack']['db']['network']['max_overflow'] %>
+
+# Verbosity of SQL debugging information. 0=None, 100=Everything
+connection_debug = <%= node['openstack']['db']['network']['connection_debug'] %>
+
+# Add python stack traces to SQL as comment strings
+connection_trace = <%= node['openstack']['db']['network']['connection_trace'] %>
+
+# If set, use this value for pool_timeout with sqlalchemy
+pool_timeout = <%= node['openstack']['db']['network']['pool_timeout'] %>
+
+[service_providers]
+# Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall.
+# Must be in form:
+# service_provider=<service_type>:<name>:<driver>[:default]
+# List of allowed service type include LOADBALANCER, FIREWALL, VPN
+# Combination of <service type> and <name> must be unique; <driver> must also be unique
+# this is multiline option, example for default provider:
+# service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default
+# example of non-default provider:
+# service_provider=FIREWALL:name2:firewall_driver_path
+# --- Reference implementations ---
+<% if node['openstack']['network']['service_provider'].any? %>
+  <% node['openstack']['network']['service_provider'].each do |provider| %>
+service_provider = <%= provider %>
+  <% end %>
+<% end %>
+
 # ===========  end of items for agent management extension =====

templates/default/plugins/bigswitch/restproxy.ini.erb

@@ -1,27 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = 2
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [RESTPROXY]
 # All configuration for this plugin is in section '[restproxy]'
 #

templates/default/plugins/brocade/brocade.ini.erb

@@ -15,22 +15,6 @@ ostype = <%= node["openstack"]["network"]["brocade"]["switch_ostype"] %>
 # address  = 10.24.84.38
 # ostype   = NOS
 
-[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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-#
-# Example:
-# sql_connection = mysql://root:pass@localhost/brcd_neutron?charset=utf8
-sql_connection = <%= @sql_connection %>
-
 [PHYSICAL_INTERFACE]
 # physical_interface = <physical network name>
 #

templates/default/plugins/cisco/cisco_plugins.ini.erb

@@ -24,13 +24,3 @@ username = <%= @info["username"] %>
 password = <%= @info["password"] %> 
 
 <%- end -%>
-
-[DATABASE]
-#
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://neutron:password@127.0.0.1:3306/cisco_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-#
-sql_connection = <%= @sql_connection %>

templates/default/plugins/hyperv/hyperv_neutron_plugin.ini.erb

@@ -1,27 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://neutron:password@127.0.0.1:3306/hyperv_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = 2
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [HYPERV]
 # (StrOpt) Type of network to allocate for tenant networks. The
 # default value 'local' is useful only for single-box testing and

templates/default/plugins/linuxbridge/linuxbridge_conf.ini.erb

@@ -23,35 +23,6 @@ tenant_network_type = <%= node["openstack"]["network"]["linuxbridge"]["tenant_ne
 # Example: network_vlan_ranges = physnet1:1000:2999
 network_vlan_ranges = <%= node["openstack"]["network"]["linuxbridge"]["network_vlan_ranges"] %>
 
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/neutron_linux_bridge
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-sql_max_retries = <%= node['openstack']['db']['network']['sql_max_retries'] %>
-
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = <%= node['openstack']['db']['network']['reconnect_interval'] %>
-
-# 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.
-sql_dbpool_enable = <%= node['openstack']['db']['network']['sql_dbpool_enable'] %>
-
-# Minimum number of SQL connections to keep open in a pool
-sql_min_pool_size = <%= node['openstack']['db']['network']['sql_min_pool_size'] %>
-
-# Maximum number of SQL connections to keep open in a pool
-sql_max_pool_size = <%= node['openstack']['db']['network']['sql_max_pool_size'] %>
-
-# Timeout in seconds before idle sql connections are reaped
-sql_idle_timeout = <%= node['openstack']['db']['network']['sql_idle_timeout'] %>
-
 [LINUX_BRIDGE]
 # (ListOpt) Comma-separated list of
 # <physical_network>:<physical_interface> tuples mapping physical

templates/default/plugins/metaplugin/metaplugin.ini.erb

@@ -1,29 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implgies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = 2
-
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [META]
 ## This is list of flavor:neutron_plugins
 # extension method is used in the order of this list

templates/default/plugins/midonet/midonet.ini.erb

@@ -1,27 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = 2
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [MIDONET]
 # MidoNet API server URI
 # midonet_uri = http://localhost:8080/midonet-api

templates/default/plugins/nec/nec.ini.erb

@@ -1,27 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = 2
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [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.

templates/default/plugins/nicira/nvp.ini.erb

@@ -63,35 +63,6 @@ default_l2_gw_service_uuid = <%= node["openstack"]["network"]["nicira"]["default
 default_iface_name = <%= node["openstack"]["network"]["nicira"]["default_iface_name"] %>
 
 
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:neutron@127.0.0.1:3306/nvp_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-
-# Number of reconnection attempts to the DB; Set to -1 to try indefinitely
-# sql_max_retries = 10
-
-# Period between reconnection attempts to the DB
-# reconnect_interval = 2
-
-# 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.
-
-# sql_dbpool_enable = False
-
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
-
 [QUOTAS]
 # number of network gateways allowed per tenant, -1 means unlimited
 quota_network_gateway = <%= node["openstack"]["network"]["nicira"]["quota_network_gateway"] %>

templates/default/plugins/openvswitch/ovs_neutron_plugin.ini.erb

@@ -1,33 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
-# main neutron server. (Leave it as is if the database runs on this host.)
-sql_connection = <%= @sql_connection %>
-
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-sql_max_retries = <%= node['openstack']['db']['network']['sql_max_retries'] %>
-
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-reconnect_interval = <%= node['openstack']['db']['network']['reconnect_interval'] %>
-
-# 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.
-sql_dbpool_enable = <%= node['openstack']['db']['network']['sql_dbpool_enable'] %>
-
-# Minimum number of SQL connections to keep open in a pool
-sql_min_pool_size = <%= node['openstack']['db']['network']['sql_min_pool_size'] %>
-
-# Maximum number of SQL connections to keep open in a pool
-sql_max_pool_size = <%= node['openstack']['db']['network']['sql_max_pool_size'] %>
-
-# Timeout in seconds before idle sql connections are reaped
-sql_idle_timeout = <%= node['openstack']['db']['network']['sql_idle_timeout'] %>
-
 [OVS]
 # (StrOpt) Type of network to allocate for tenant networks. The
 # default value 'local' is useful only for single-box testing and

templates/default/plugins/plumgrid/plumgrid.ini.erb

@@ -1,27 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example:
-# sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_neutron
-# Replace <host> above with the IP address of the database used by the
-# main neutron server.
-sql_connection = <%= @sql_connection %>
-# Database reconnection retry times - in event connectivity is lost
-# set to -1 implies an infinite retry count
-# sql_max_retries = 10
-# Database reconnection interval in seconds - if the initial connection to the
-# database fails
-# reconnect_interval = 2
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [PLUMgridNOS]
 # This line should be pointing to the NOS server,
 # for the PLUMgrid platform. In other deployments,

templates/default/plugins/ryu/ryu.ini.erb

@@ -1,18 +1,4 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-[DATABASE]
-# This line MUST be changed to actually run the plugin.
-# Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_neutron
-sql_connection = <%= @sql_connection %>
-# 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.
-# sql_dbpool_enable = False
-# Minimum number of SQL connections to keep open in a pool
-# sql_min_pool_size = 1
-# Maximum number of SQL connections to keep open in a pool
-# sql_max_pool_size = 5
-# Timeout in seconds before idle sql connections are reaped
-# sql_idle_timeout = 3600
-
 [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.