Changes to reflect the new features (mutli-blade, multi-chassis support).

diff --git a/quantum/plugins/cisco/README b/quantum/plugins/cisco/README
index e15c9ac3895671e8500a2af47704ce80fb94504a..095a69adc08bb447e9f7ec47c40e73aa19aa8ffc 100755 (executable)
--- a/quantum/plugins/cisco/README
+++ b/quantum/plugins/cisco/README
@@ -2,7 +2,8 @@
 README: A Quantum Plugin Framework for Supporting L2 Networks Spannning Multiple Switches\r
 =========================================================================================\r
 \r
-:Author:  Sumit Naiksatam, Ram Durairaj, Mark Voelker, Edgar Magana, Shweta Padubidri, Rohit Agarwalla, Ying Liu, Debo Dutta\r
+:Author:  Sumit Naiksatam, Ram Durairaj, Mark Voelker, Edgar Magana, Shweta Padubidri,\r
+          Rohit Agarwalla, Ying Liu, Debo Dutta\r
 :Contact: netstack@lists.launchpad.net\r
 :Web site: https://launchpad.net/~cisco-openstack\r
 :Copyright: 2011 Cisco Systems, Inc.\r
@@ -86,7 +87,11 @@ Module Structure:
                        /common - Modules common to the entire plugin\r
                        /conf   - All configuration files\r
                        /db     - Persistence framework\r
+                       /models - Class(es) which tie the logical abstractions\r
+                                 to the physical topology\r
                        /nexus  - Nexus-specific modules\r
+                       /segmentation - Implementation of segmentation manager,\r
+                                       e.g. VLAN Manager\r
                        /tests  - Tests specific to this plugin\r
                        /ucs    - UCS-specific modules\r
 \r
@@ -100,9 +105,16 @@ Plugin Installation Instructions
 \r
 provider = quantum.plugins.cisco.l2network_plugin.L2Network\r
 \r
-3.  If you are not running Quantum on the same host as the OpenStack Cloud\r
-    Controller, you will need to change the db_ip_address configuration\r
-    in nova.ini.\r
+3.  Configure your OpenStack installation to use the 802.1qbh VIF driver and\r
+    Quantum-aware scheduler by editing the /etc/nova/nova.conf file with the\r
+    following entries:\r
+\r
+--scheduler_driver=quantum.plugins.cisco.nova.quantum_aware_scheduler.QuantumScheduler\r
+--quantum_host=127.0.0.1\r
+--quantum_port=9696\r
+--libvirt_vif_driver=quantum.plugins.cisco.nova.vifdirect.Libvirt802dot1QbhDriver\r
+--libvirt_vif_type=802.1Qbh\r
+ \r
 \r
 4.  If you want to turn on support for Cisco Nexus switches:\r
     4a.  Uncomment the nexus_plugin property in \r
@@ -165,7 +177,39 @@ password=mySecretPasswordForNova
 username=admin\r
 password=mySecretPasswordForNexus\r
 \r
-7.  Start the Quantum service.  If something doesn't work, verify that\r
+7.  Configure the UCS systems' information in your deployment by editing the\r
+    quantum/plugins/cisco/conf/ucs_inventory.ini file. You can configure multiple\r
+    UCSMs per deployment, multiple chasses per UCSM, and multiple blades per\r
+    chassis. Chassis ID and blade ID can be obtained from the UCSM (they will\r
+    typically numbers like 1, 2, 3, etc.\r
+\r
+[ucsm-1]\r
+ip_address = <put_ucsm_ip_address_here>\r
+[[chassis-1]]\r
+chassis_id = <put_the_chassis_id_here>\r
+[[[blade-1]]]\r
+blade_id = <put_blade_id_here>\r
+host_name = <put_hostname_here>\r
+[[[blade-2]]] \r
+blade_id = <put_blade_id_here> \r
+host_name = <put_hostname_here> \r
+[[[blade-3]]]\r
+blade_id = <put_blade_id_here>\r
+host_name = <put_hostname_here>\r
+         \r
+[ucsm-2]\r
+ip_address = <put_ucsm_ip_address_here>\r
+[[chassis-1]]\r
+chassis_id = <put_the_chassis_id_here>\r
+[[[blade-1]]]\r
+blade_id = <put_blade_id_here>\r
+host_name = <put_hostname_here>\r
+[[[blade-2]]]\r
+blade_id = <put_blade_id_here>\r
+host_name = <put_hostname_here>\r
+\r
+\r
+8.  Start the Quantum service.  If something doesn't work, verify that\r
     your configuration of each of the above files hasn't gone a little kaka.\r
     Once you've put right what once went wrong, leap on.\r
 \r