From: Andreas Jaeger <aj@suse.de>
Date: Sun, 3 Nov 2013 16:31:29 +0000 (+0100)
Subject: Remove database section from plugin.ini
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f960072daf1d9889d8fcfb2819408a077e9e4ee8;p=openstack-build%2Fneutron-build.git

Remove database section from plugin.ini

Change https://review.openstack.org/#/c/34515 moved the database
config items to neutron.conf but left some commented out
[database] items. Remove them as well.

Closes-Bug: #1247589
Change-Id: I05913d0c27a683cec30cae31a1978612aa1e1360
---

diff --git a/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini b/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
index 236bc7e0f..5eeec5706 100644
--- a/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
+++ b/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
@@ -51,8 +51,6 @@
 #
 # Neutron server:
 #
-# [database]
-# connection = mysql://root:nova@127.0.0.1:3306/hyperv_neutron
 # [HYPERV]
 # tenant_network_type = vlan
 # network_vlan_ranges = default:2000:3999
diff --git a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
index a434b2547..bb3caf3a5 100644
--- a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+++ b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -134,19 +134,13 @@
 #-----------------------------------------------------------------------------
 #
 # 1. With VLANs on eth1.
-# [database]
-# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges = default:2000:3999
 # tunnel_id_ranges =
 # integration_bridge = br-int
 # bridge_mappings = default:br-eth1
-# [AGENT]
-# Add the following setting, if you want to log to a file
 #
 # 2. With tunneling.
-# [database]
-# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges =
 # tunnel_id_ranges = 1:1000