From ed84b41a3458a81f8db7c00704e0b773768de50a Mon Sep 17 00:00:00 2001
From: Ying Liu <yinliu2@cisco.com>
Date: Fri, 19 Aug 2011 00:14:44 -0700
Subject: [PATCH] remove all configuration files

---
 extensions/_faults.py                           |  2 +-
 quantum/plugins.ini                             |  2 --
 quantum/plugins/cisco/conf/credentials.ini      | 15 ---------------
 quantum/plugins/cisco/conf/db_conn.ini          |  5 -----
 quantum/plugins/cisco/conf/l2network_plugin.ini | 16 ----------------
 quantum/plugins/cisco/conf/nexus.ini            | 10 ----------
 quantum/plugins/cisco/conf/nova.ini             |  8 --------
 quantum/plugins/cisco/conf/plugins.ini          |  3 ---
 quantum/plugins/cisco/conf/ucs.ini              | 10 ----------
 9 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 quantum/plugins.ini
 delete mode 100644 quantum/plugins/cisco/conf/credentials.ini
 delete mode 100644 quantum/plugins/cisco/conf/db_conn.ini
 delete mode 100644 quantum/plugins/cisco/conf/l2network_plugin.ini
 delete mode 100644 quantum/plugins/cisco/conf/nexus.ini
 delete mode 100644 quantum/plugins/cisco/conf/nova.ini
 delete mode 100644 quantum/plugins/cisco/conf/plugins.ini
 delete mode 100644 quantum/plugins/cisco/conf/ucs.ini

diff --git a/extensions/_faults.py b/extensions/_faults.py
index cb44fd187..6bdd3a48b 100644
--- a/extensions/_faults.py
+++ b/extensions/_faults.py
@@ -63,7 +63,7 @@ class Fault(webob.exc.HTTPException):
         default_xmlns = common.XML_NS_V10
         serializer = wsgi.Serializer(metadata, default_xmlns)
         content_type = req.best_match_content_type()
-        self.wrapped_exc.body = serializer.serialize(fault_data, content_type)
+        #self.wrapped_exc.body = serializer.serialize(fault_data, content_type)
         self.wrapped_exc.content_type = content_type
         return self.wrapped_exc
 
diff --git a/quantum/plugins.ini b/quantum/plugins.ini
deleted file mode 100644
index 20a83de77..000000000
--- a/quantum/plugins.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[PLUGIN]
-provider = quantum.plugins.SamplePlugin.FakePlugin
diff --git a/quantum/plugins/cisco/conf/credentials.ini b/quantum/plugins/cisco/conf/credentials.ini
deleted file mode 100644
index 96e912cc7..000000000
--- a/quantum/plugins/cisco/conf/credentials.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-#Provide the UCSM credentials
-[<put_ucsm_ip_address_here>]
-username=<put_user_name_here>
-password=<put_password_here>
-
-#Provide the Nova DB credentials, the IP address should be the same as in nova.ini
-[<put_nova_db_ip_here>]
-username=<put_user_name_here>
-password=<put_password_here>
-
-#Provide the Nexus credentials, if you are using Nexus
-[<put_nexus_ip_address_here>]
-username=<put_user_name_here>
-password=<put_password_here>
-
diff --git a/quantum/plugins/cisco/conf/db_conn.ini b/quantum/plugins/cisco/conf/db_conn.ini
deleted file mode 100644
index 28461f766..000000000
--- a/quantum/plugins/cisco/conf/db_conn.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DATABASE]
-name = quantum_l2network
-user = <put_db_user_name_here>
-pass = <put_db_password_here>
-host = <put_quantum_mysql_host_here> 
diff --git a/quantum/plugins/cisco/conf/l2network_plugin.ini b/quantum/plugins/cisco/conf/l2network_plugin.ini
deleted file mode 100644
index 3a740a971..000000000
--- a/quantum/plugins/cisco/conf/l2network_plugin.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[VLANS]
-vlan_start=<put_vlan_id_range_start_here>
-vlan_end=<put_vlan_id_range_end_here>
-vlan_name_prefix=q-
-
-[PORTS]
-max_ports=100
-
-[PORTPROFILES]
-max_port_profiles=65568
-
-[NETWORKS]
-max_networks=65568
-
-[MODEL]
-model_class=quantum.plugins.cisco.l2network_model.L2NetworkModel
diff --git a/quantum/plugins/cisco/conf/nexus.ini b/quantum/plugins/cisco/conf/nexus.ini
deleted file mode 100644
index a4efcb206..000000000
--- a/quantum/plugins/cisco/conf/nexus.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[SWITCH]
-# Change the following to reflect the Nexus switch details
-nexus_ip_address=<put_nexus_switch_ip_address_here>
-#Port number of the Interface connected from the Nexus 7K Switch to UCSM 6120, e.g.: 3/23
-nexus_port=<put_interface_name_here>
-#Port number where the SSH will be running at the Nexus Switch, e.g.: 22 (Default) 
-nexus_ssh_port=22
-
-[DRIVER]
-name=quantum.plugins.cisco.nexus.cisco_nexus_network_driver.CiscoNEXUSDriver
diff --git a/quantum/plugins/cisco/conf/nova.ini b/quantum/plugins/cisco/conf/nova.ini
deleted file mode 100644
index 7ef5d4396..000000000
--- a/quantum/plugins/cisco/conf/nova.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[NOVA]
-#Change the following details to reflect your OpenStack Nova configuration. If you are running this service on the same machine as the Nova DB, you do not have to change the IP address.
-db_server_ip=127.0.0.1
-db_name=nova
-db_username=<put_db_user_name_here>
-db_password=<put_db_password_here>
-nova_host_name=<put_openstack_cloud_controller_hostname_here>
-nova_proj_name=<put_openstack_project_name_here>
diff --git a/quantum/plugins/cisco/conf/plugins.ini b/quantum/plugins/cisco/conf/plugins.ini
deleted file mode 100644
index 8b4b476a0..000000000
--- a/quantum/plugins/cisco/conf/plugins.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[PLUGINS]
-ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin
-#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin.NexusPlugin
diff --git a/quantum/plugins/cisco/conf/ucs.ini b/quantum/plugins/cisco/conf/ucs.ini
deleted file mode 100644
index 431025313..000000000
--- a/quantum/plugins/cisco/conf/ucs.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[UCSM]
-#change the following to the appropriate UCSM IP address
-ip_address=<put_ucsm_ip_address_here>
-default_vlan_name=default
-default_vlan_id=1
-max_ucsm_port_profiles=1024
-profile_name_prefix=q-
-
-[DRIVER]
-name=quantum.plugins.cisco.ucs.cisco_ucs_network_driver.CiscoUCSMDriver
-- 
2.45.2