From: Ying Liu Date: Thu, 18 Aug 2011 23:33:08 +0000 (-0700) Subject: change the configuration files to the default values X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5834bcc8e20654feb4e22cab53c83502a315f071;p=openstack-build%2Fneutron-build.git change the configuration files to the default values --- diff --git a/quantum/plugins.ini b/quantum/plugins.ini index 27c13c73f..20a83de77 100644 --- a/quantum/plugins.ini +++ b/quantum/plugins.ini @@ -1,4 +1,2 @@ [PLUGIN] -#provider = quantum.plugins.cisco.l2network_plugin.L2Network -provider = quantum.plugins.cisco.CiscoPlugin.CiscoPaloPlugin2 -#provider = quantum.plugins.SamplePlugin.FakePlugin +provider = quantum.plugins.SamplePlugin.FakePlugin diff --git a/quantum/plugins/cisco/conf/db_conn.ini b/quantum/plugins/cisco/conf/db_conn.ini index fdc7ace15..28461f766 100644 --- a/quantum/plugins/cisco/conf/db_conn.ini +++ b/quantum/plugins/cisco/conf/db_conn.ini @@ -1,5 +1,5 @@ [DATABASE] name = quantum_l2network -user =root -pass =nova -host =localhost +user = +pass = +host = diff --git a/quantum/plugins/cisco/conf/l2network_plugin.ini b/quantum/plugins/cisco/conf/l2network_plugin.ini index f51c1ae33..3a740a971 100644 --- a/quantum/plugins/cisco/conf/l2network_plugin.ini +++ b/quantum/plugins/cisco/conf/l2network_plugin.ini @@ -1,6 +1,6 @@ [VLANS] -vlan_start=100 -vlan_end=300 +vlan_start= +vlan_end= vlan_name_prefix=q- [PORTS] diff --git a/quantum/plugins/cisco/conf/plugins.ini b/quantum/plugins/cisco/conf/plugins.ini index a4b62c890..8b4b476a0 100644 --- a/quantum/plugins/cisco/conf/plugins.ini +++ b/quantum/plugins/cisco/conf/plugins.ini @@ -1,3 +1,3 @@ [PLUGINS] -#ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin +ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin #nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin.NexusPlugin