From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Sun, 21 Aug 2011 05:31:50 +0000 (-0700)
Subject: Changes to reflect the new features (mutli-blade, multi-chassis support).
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0cd69434071944b7b3b46d2d74481333c966e8e3;p=openstack-build%2Fneutron-build.git

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

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