]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
remove all configuration files
authorYing Liu <yinliu2@cisco.com>
Fri, 19 Aug 2011 07:14:44 +0000 (00:14 -0700)
committerYing Liu <yinliu2@cisco.com>
Fri, 19 Aug 2011 07:14:44 +0000 (00:14 -0700)
extensions/_faults.py
quantum/plugins.ini [deleted file]
quantum/plugins/cisco/conf/credentials.ini [deleted file]
quantum/plugins/cisco/conf/db_conn.ini [deleted file]
quantum/plugins/cisco/conf/l2network_plugin.ini [deleted file]
quantum/plugins/cisco/conf/nexus.ini [deleted file]
quantum/plugins/cisco/conf/nova.ini [deleted file]
quantum/plugins/cisco/conf/plugins.ini [deleted file]
quantum/plugins/cisco/conf/ucs.ini [deleted file]

index cb44fd1873ce6f690548ec306df97a582b424872..6bdd3a48b93cd225ece2da12256cc907d1b2d7c9 100644 (file)
@@ -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 (file)
index 20a83de..0000000
+++ /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 (file)
index 96e912c..0000000
+++ /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 (file)
index 28461f7..0000000
+++ /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 (file)
index 3a740a9..0000000
+++ /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 (file)
index a4efcb2..0000000
+++ /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 (file)
index 7ef5d43..0000000
+++ /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 (file)
index 8b4b476..0000000
+++ /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 (file)
index 4310253..0000000
+++ /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