Reformat the rst documents

author 10013968 <zhang.jun3g@zte.com.cn>

Mon, 18 Jul 2016 15:51:00 +0000 (23:51 +0800)

committer 10013968 <zhang.jun3g@zte.com.cn>

Wed, 27 Jul 2016 15:49:59 +0000 (23:49 +0800)
author 10013968 <zhang.jun3g@zte.com.cn>
Mon, 18 Jul 2016 15:51:00 +0000 (23:51 +0800)
committer 10013968 <zhang.jun3g@zte.com.cn>
Wed, 27 Jul 2016 15:49:59 +0000 (23:49 +0800)
diff --git a/docs/configguide/lab_update_guide.rst b/docs/configguide/lab_update_guide.rst

index 98aec63..c939164 100644 (file)
--- a/docs/configguide/lab_update_guide.rst
+++ b/docs/configguide/lab_update_guide.rst
@@ -18,7 +18,8 @@ Details about each Community Lab is found in 3 places:
   - Pharos repo docs ...
  
      - docs/information/pharos.rst ... project information file
-    - docs/labs/ ... Lab documents (includes lab specific capabilities, usages and policies; POD information)
+    - docs/labs/ ... Lab documents (includes lab specific capabilities, usages and policies;
+      POD information)
      - docs/labs/images/ ... Lab and POD toplogies
  
  Update Pharos repo
@@ -27,7 +28,8 @@ Update Pharos repo
  Clone the Pharos Git repository
  
   * Make the changes to Pharos project information file (docs/information/pharos.rst)
- * After code gets merged http://artifacts.opnfv.org/pharos/docs/information/pharos.html will contain your change
+ * After code gets merged http://artifacts.opnfv.org/pharos/docs/information/pharos.html will
+   contain your change
  
  
  Update Pharos Wiki
@@ -37,16 +39,16 @@ Edit Wiki page
  
   * https://wiki.opnfv.org/pharos
   * Look for {{scrape>http://artifacts.opnfv.org/pharos/docs/information/pharos.html}}
- * Click "Preview" and see if your change is shown; if shown add a short "Edit summary" and click "Save"
-   (Wiki does not auto update content)
+ * Click "Preview" and see if your change is shown; if shown add a short "Edit summary" and click
+   "Save" (Wiki does not auto update content)
  
-You will see a section of code as shown below. Add your page to the bullet list with wiki link,
-nice name, and location summary
+You will see a section of code as shown below. Add your page to the bullet list with wiki link, nice
+name, and location summary
  
  Update the map info on the Pharos Project Page https://wiki.opnfv.org/pharos?&#community_labs
  
- * You will see a section of code as shown below. Add your lab infomation to the list with a comma separated
-   list as follows:
+ * You will see a section of code as shown below. Add your lab infomation to the list with a comma
+   separated list as follows:
  
      * longitude
      * latitude
diff --git a/docs/configguide/pharosconfig.rst b/docs/configguide/pharosconfig.rst

index 6b0783d..6b48100 100644 (file)
--- a/docs/configguide/pharosconfig.rst
+++ b/docs/configguide/pharosconfig.rst
@@ -8,14 +8,15 @@
  Pharos Configuration
  ********************
  
-OPNFV development, test and production activities rely on Pharos resources and support from the Pharos community. Lab
-owners and Pharos project committers/contributors will evolve the vision for Pharos as well as expand lab capabilities
-that are needed to help OPNFV be highly successful.
+OPNFV development, test and production activities rely on Pharos resources and support from the
+Pharos community. Lab owners and Pharos project committers/contributors will evolve the vision for
+Pharos as well as expand lab capabilities that are needed to help OPNFV be highly successful.
  
-Pharos configuration documents provide information on how to setup hardware and networks in a Pharos compliant lab. Jira
-is used to track Pharos activities including lab operations. PODs are connected to Jenkins and generally available 24/7
-other than scheduled maintenance and troubleshooting. Lab resources are declared as either for *Development (bare-metal
-or virtual)*, *Production latest (bare-metal)* or *Production stable (bare-metal)*
+Pharos configuration documents provide information on how to setup hardware and networks in a Pharos
+compliant lab. Jira is used to track Pharos activities including lab operations. PODs are connected
+to Jenkins and generally available 24/7 other than scheduled maintenance and troubleshooting. Lab
+resources are declared as either for *Development (bare-metal or virtual)*, *Production latest
+(bare-metal)* or *Production stable (bare-metal)*
  
  .. toctree::
  
diff --git a/docs/how-to-use-docs/documentation-example.rst b/docs/how-to-use-docs/documentation-example.rst

index 54819dc..ae0a7f2 100644 (file)
--- a/docs/how-to-use-docs/documentation-example.rst
+++ b/docs/how-to-use-docs/documentation-example.rst
@@ -13,7 +13,8 @@
  How to create documentation for your OPNFV project
  ==================================================
  
-this is the directory structure of the docs/ directory that can be found in the root of your project directory
+this is the directory structure of the docs/ directory that can be found in the root of your project
+directory
  
  .. code-block:: bash
  
@@ -24,8 +25,8 @@ this is the directory structure of the docs/ directory that can be found in the
      ./how-to-use-docs/documentation-example.rst
      ./how-to-use-docs/index.rst
  
-To create your own documentation, Create any number of directories (depending on your need) and place in each of them an index.rst.
-This index file must refence your other rst files.
+To create your own documentation, Create any number of directories (depending on your need) and
+place in each of them an index.rst.  This index file must refence your other rst files.
  
  * Here is an example index.rst
  
@@ -55,12 +56,14 @@ When you push documentation changes to gerrit a jenkins job will create html doc
  
  * Verify Jobs
  
-For verify jobs a link to the documentation will show up as a comment in gerrit for you to see the result.
+For verify jobs a link to the documentation will show up as a comment in gerrit for you to see the
+result.
  
  * Merge jobs
  
-Once you are happy with the look of your documentation you can submit the patchset the merge job will
-copy the output of each documentation directory to http://artifacts.opnfv.org/$project/docs/$name_of_your_folder/index.html
+Once you are happy with the look of your documentation you can submit the patchset the merge job
+will copy the output of each documentation directory to
+http://artifacts.opnfv.org/$project/docs/$name_of_your_folder/index.html
  
  Here are some quick examples of how to use rst markup
  
@@ -68,7 +71,8 @@ This is a headline::
  
    here is some code, note that it is indented
  
-links are easy to add: Here is a link to sphinx, the tool that we are using to generate documetation http://sphinx-doc.org/
+links are easy to add: Here is a link to sphinx, the tool that we are using to generate documetation
+http://sphinx-doc.org/
  
  * Bulleted Items
  
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst

index 87739dd..24e46d9 100644 (file)
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -13,24 +13,25 @@ Pharos Project Information
  Introduction
  ------------
  
-The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ deals with developing an OPNFV lab infrastructure
-that is geographically and technically diverse.
-This will greatly assist in developing a highly robust and stable OPNFV platform. Community labs are hosted by
-individual companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access for key
-development and production activities. The **Pharos Specification** defines a "compliant" deployment and test
-environment. Pharos is responsible for defining lab capabilities, developing management/usage policies and process;
-and a support plan for reliable access to project and release resources. Community labs are provided as a service by
-companies and are not controlled by Pharos however our goal is to provide easy visibility of all lab capabilities
-and their usage at all-times.
-
-A requirement of Pharos labs is to provide *bare-metal* for development, deployment and testing. This is resource
-intensive from a hardware and support perspective while providing remote access can also be very challenging due to
-corporate IT policies. Achieving a consistent *look and feel* of a federated lab infrastructure continues to be an
-objective. Virtual environments are also useful and provided by some labs. Jira is currently used for tracking lab
-operational issues as well as for Pharos project activities.
-
-Future lab capabilities are currently focussed on 1) Deployment automation 2) Dashboards (for capability and usage)
-3) *Virtual Labs* for developer on-boarding.
+The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ deals with developing an OPNFV lab
+infrastructure that is geographically and technically diverse.  This will greatly assist in
+developing a highly robust and stable OPNFV platform. Community labs are hosted by individual
+companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access
+for key development and production activities. The **Pharos Specification** defines a "compliant"
+deployment and test environment. Pharos is responsible for defining lab capabilities, developing
+management/usage policies and process; and a support plan for reliable access to project and release
+resources. Community labs are provided as a service by companies and are not controlled by Pharos
+however our goal is to provide easy visibility of all lab capabilities and their usage at all-times.
+
+A requirement of Pharos labs is to provide *bare-metal* for development, deployment and testing.
+This is resource intensive from a hardware and support perspective while providing remote access can
+also be very challenging due to corporate IT policies. Achieving a consistent *look and feel* of a
+federated lab infrastructure continues to be an objective. Virtual environments are also useful and
+provided by some labs. Jira is currently used for tracking lab operational issues as well as for
+Pharos project activities.
+
+Future lab capabilities are currently focussed on 1) Deployment automation 2) Dashboards (for
+capability and usage) 3) *Virtual Labs* for developer on-boarding.
  
  * `Pharos page <https://www.opnfv.org/developers/pharos>`_
  * `Pharos project Wiki <https://wiki.opnfv.org/display/pharos>`_
@@ -62,8 +63,8 @@ Pharos Lab Process
  Current Labs
  ------------
  
-An interactive map of OPNFV lab locations, lab owners and other lab information is maintained on the `Pharos Wiki
-<https://wiki.opnfv.org/pharos#community_labs>`_
+An interactive map of OPNFV lab locations, lab owners and other lab information is maintained on the
+`Pharos Wiki <https://wiki.opnfv.org/pharos#community_labs>`_
  
  +----+---------------+----------------------------------------------------------------------------+-------------------+
  | #  | **Hosted by** |  **Home page**                                                             | **Location**      |
@@ -116,5 +117,6 @@ Pharos project Key Facts
  
  **Key Project Facts are maintained in the Pharos INFO file in the project repo**
  
-     * Can be viewed on the project Wiki `INFO <https://wiki.opnfv.org/display/pharos/#PharosHome-KeyProjectFacts>`_
-     * Project key facts in repo: pharos/INFO
+  * Can be viewed on the project Wiki
+    `INFO <https://wiki.opnfv.org/pharos?&#pharos_project_-_key_facts>`_
+  * Project key facts in repo: pharos/INFO
diff --git a/docs/lab-description/inventory.rst b/docs/lab-description/inventory.rst

index db1ea54..81c0dd5 100644 (file)
--- a/docs/lab-description/inventory.rst
+++ b/docs/lab-description/inventory.rst
@@ -6,6 +6,6 @@
  POD Inventory File
  ******************
  
-The Common Inventory File provides a template for machine reabable input into every installer. For convenience the
-YAML file template currently resides in the Genesis Project repo. Refer to the following patch for further infomation
-https://gerrit.opnfv.org/gerrit/#/c/4079.
+The Common Inventory File provides a template for machine reabable input into every installer. For
+convenience the YAML file template currently resides in the Genesis Project repo. Refer to the
+following patch for further infomation https://gerrit.opnfv.org/gerrit/#/c/4079.
diff --git a/docs/lab-description/pod_description.rst b/docs/lab-description/pod_description.rst

index b63097d..2d4047a 100644 (file)
--- a/docs/lab-description/pod_description.rst
+++ b/docs/lab-description/pod_description.rst
@@ -26,48 +26,48 @@ Server Specifications
  
  **Jump Host**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|             |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-jump |  Dell        | R730         | ABCDEF007    |  2 x E5-2699 |  64 GB       | 240GB SSD    | 10.10.10.10            | IF0: 10.2.117.36       | IF2: 10.2.12.1         |              |
-|              |              |              |              |              |              | 1 TB SATA    | 00:1E:67:D4:36:9A      | 00:1E:67:4F:B7:B1      | 00:1E:67:4F:B7:B4      |              |
-|              |              |              |              |              |              |              | root/root              | VLAN 984               | VLAN 202               |              |
-|              |              |              |              |              |              |              |                        | Public                 | Private                |              |
-|              |              |              |              |              |              |              |                        | IF1: 10.2.1.1          | IF3: 10.2.13.1         |              |
-|              |              |              |              |              |              |              |                        | 00:1E:67:4F:B7:B2      | 00:1E:67:4F:B7:B5      |              |
-|              |              |              |              |              |              |              |                        | VLAN 201               | VLAN 203               |              |
-|              |              |              |              |              |              |              |                        | Admin                  | Storage                |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++--------------+---------+-------+---------------+--------------+--------+-----------+---------------------+-------------------+-------------------+-------+
+|              |         |       |               |              |        | Local     | Lights-out network  | 1GbE: NIC#/IP     | 10GbE: NIC#/IP    |       |
+|  Hostname    |  Vendor | Model | Serial Number |  CPUs        | Memory | storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network  | MAC/VLAN/Network  | Notes |
++--------------+---------+-------+---------------+--------------+--------+-----------+---------------------+-------------------+-------------------+-------+
+| pod2-jp-jump |  Dell   | R730  | ABCDEF007     |  2 x E5-2699 |  64 GB | 240GB SSD | 10.10.10.10         | IF0: 10.2.117.36  | IF2: 10.2.12.1    |       |
+|              |         |       |               |              |        | 1 TB SATA | 00:1E:67:D4:36:9A   | 00:1E:67:4F:B7:B1 | 00:1E:67:4F:B7:B4 |       |
+|              |         |       |               |              |        |           | root/root           | VLAN 984          | VLAN 202          |       |
+|              |         |       |               |              |        |           |                     | Public            | Private           |       |
+|              |         |       |               |              |        |           |                     | IF1: 10.2.1.1     | IF3: 10.2.13.1    |       |
+|              |         |       |               |              |        |           |                     | 00:1E:67:4F:B7:B2 | 00:1E:67:4F:B7:B5 |       |
+|              |         |       |               |              |        |           |                     | VLAN 201          | VLAN 203          |       |
+|              |         |       |               |              |        |           |                     | Admin             | Storage           |       |
++--------------+---------+-------+---------------+--------------+--------+-----------+---------------------+-------------------+-------------------+-------+
  
  
  **Compute Nodes**
  
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-node1|              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-node2|              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-node3|              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-node4|              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod2-jp-node5|              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+|               |         |       |               |       |        | Local   | Lights-out network  | 1GbE: NIC#/IP    | 10GbE: NIC#/IP   |       |
+|  Hostname     |  Vendor | Model | Serial Number |  CPUs | Memory | storage | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+| pod2-jp-node1 |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+| pod2-jp-node2 |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+| pod2-jp-node3 |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+| pod2-jp-node4 |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
+| pod2-jp-node5 |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
+|               |         |       |               |       |        |         |                     |                  |                  |       |
++---------------+---------+-------+---------------+-------+--------+---------+---------------------+------------------+------------------+-------+
  
  VPN Users
  ---------
@@ -92,8 +92,9 @@ Firewall Rules
  POD Topology
  ------------
  
-Provide a diagram showing the network topology of the POD. Any security sensitive details should
-not be exposed publically and can be stored in the secure Pharos repo. The following diagram is an example only.
+Provide a diagram showing the network topology of the POD. Any security sensitive details should not
+be exposed publically and can be stored in the secure Pharos repo. The following diagram is an
+example only.
  
  .. image:: ./images/pod_topology_example.png
     :alt: POD diagram not found
diff --git a/docs/lab-description/templates.rst b/docs/lab-description/templates.rst

index f845457..c207cfa 100644 (file)
--- a/docs/lab-description/templates.rst
+++ b/docs/lab-description/templates.rst
@@ -8,15 +8,16 @@
  Pharos Templates and Configuration Files
  ****************************************
  
-Lab and POD templates are provided to help lab owners document capabilities, configurations and network topologies.
-Compute, network and storage specifications with network topology details are required to help developers use lab
-resources efficiently while minimizing support needs. This also greatly assists with troubleshhoting. It is the
-responsibility of the lab owner to keep individual lab documents updated and determine appropriate level of detail
-that is exposed publically through the Wiki or maintained in a secure Pharos repo with controlled access.
+Lab and POD templates are provided to help lab owners document capabilities, configurations and
+network topologies.  Compute, network and storage specifications with network topology details are
+required to help developers use lab resources efficiently while minimizing support needs. This also
+greatly assists with troubleshhoting. It is the responsibility of the lab owner to keep individual
+lab documents updated and determine appropriate level of detail that is exposed publically through
+the Wiki or maintained in a secure Pharos repo with controlled access.
  
-While human readable configuration files are needed, the goal is for full automation of deployments. This requires
-a common machine readable format for POD configurations as input to every installer. This is the "POD inventory"
-common format file.
+While human readable configuration files are needed, the goal is for full automation of deployments.
+This requires a common machine readable format for POD configurations as input to every installer.
+This is the "POD inventory" common format file.
  
  
  .. toctree::
diff --git a/docs/labs/Dell.rst b/docs/labs/Dell.rst

index da93479..d93eb5d 100644 (file)
--- a/docs/labs/Dell.rst
+++ b/docs/labs/Dell.rst
@@ -4,8 +4,8 @@ Dell OPNFV Testlab
  Overview
  ------------------
  
-Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal servers
-for the use of OPNFV community as part of the OPNFV Pharos Project
+Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal
+servers for the use of OPNFV community as part of the OPNFV Pharos Project
  
  
  The Dell Testlab consists of 2 PODs
@@ -34,40 +34,40 @@ following specifications:
  POD1-Fuel
  ^^^^^^^^^
  
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname            |  Model               | Memory         | Storage      | Processor           | Socket     |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Fuel Jump Server    |  Dell PowerEdge M620 | 64 GB          | 1200GB HDD   | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node2               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node3               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node4               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node5               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node6               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
++------------------+----------------------+--------+------------+---------------------+--------+
+| Hostname         |  Model               | Memory | Storage    | Processor           | Socket |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Fuel Jump Server |  Dell PowerEdge M620 | 64 GB  | 1200GB HDD | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Node2            |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Node3            |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Node4            |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Node5            |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
+| Node6            |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++------------------+----------------------+--------+------------+---------------------+--------+
  
  POD2-Foreman
  ^^^^^^^^^^^^
  
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname            |  Model               |    Memory      | Storage      | Processor           | Socket     |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Foreman Jump Server |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node7               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node8               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node9               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node11              |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node12              |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Hostname            |  Model               |    Memory | Storage   | Processor           | Socket |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Foreman Jump Server |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Node7               |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Node8               |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Node9               |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Node11              |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
+| Node12              |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++---------------------+----------------------+-----------+-----------+---------------------+--------+
  
  Software
  ---------
@@ -94,81 +94,81 @@ POD1-Fuel
     :alt: POD1-Fuel Overview
     :align: left
  
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports|MAC                | BW    | Roles                            |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Fuel Jump           |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:81 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:84 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:85 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:87 | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node2               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:8E | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:91 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:92 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:94 | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:96 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:98 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node3               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:9B | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:9E | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:9F | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:A1 | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:A3 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:A5 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node4               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:A8 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:AB | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:AC | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:AE | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:B0 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:B1 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node5               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:B5 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:B8 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:B9 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:BB | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:BD | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:C0 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node6               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:C2 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:C5 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:C6 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:C8 | 10G   | Fuel Admin/mgmt/pvt/ storage     |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:CA | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:CD | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Hostname  |  NIC Model                          | Ports | MAC               | BW  | Roles                        |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Fuel Jump |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:81 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:84 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:85 | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:87 | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Node2     |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:8E | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:91 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:92 | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:94 | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:96 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:98 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Node3     |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:9B | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:9E | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:9F | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:A1 | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:A3 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:A5 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Node4     |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:A8 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:AB | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:AC | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:AE | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:B0 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:B1 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Node5     |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:B5 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:B8 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:B9 | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:BB | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:BD | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:C0 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+| Node6     |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:C2 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | em2   | A4:1F:72:11:B4:C5 | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:C6 | 10G | Public                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p3p2  | A4:1F:72:11:B4:C8 | 10G | Fuel Admin/mgmt/pvt/ storage |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |  3, Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:CA | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
+|           |                                     | p1p2  | A4:1F:72:11:B4:CD | 10G | Unused                       |
++-----------+-------------------------------------+-------+-------------------+-----+------------------------------+
  
  
  
@@ -182,104 +182,104 @@ POD2-Foreman
     :align: left
  
  
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports|MAC                | BW    | Roles                            |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Foreman Jump        |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:1D | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:20 | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:21 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:23 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, TBD                                      | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node7               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:CF | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:D2 | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:D3 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:D5 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3,  Broadcom  NetXtreme II BCM57810         | p1p1 | A4:1F:72:11:B4:D7 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:DA | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node8               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:DC | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:DF | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:E0 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:E2 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:E4 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:E7 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node9               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:E9 | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:EC | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:ED | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:EF | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:F1 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:F3 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node11              |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:03 | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:06 | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:07 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:09 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B5:0B | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B5:0D | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node12              |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:10 | 10G   | Foreman Admin                    |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:13 | 10G   | Foreman Private/ Storage         |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:14 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:16 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, TBD                                      | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Hostname     |  NIC Model                           | Ports | MAC               | BW  | Roles                    |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Foreman Jump |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:1D | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:20 | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:21 | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:23 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3, TBD                              | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Node7        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:CF | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:D2 | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:D3 | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:D5 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3,  Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:D7 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:DA | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Node8        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:DC | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:DF | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:E0 | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:E2 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3, Broadcom  NetXtreme II BCM57810  | p1p1  | A4:1F:72:11:B4:E4 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:E7 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Node9        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:E9 | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:EC | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:ED | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:EF | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3, Intel  82599                     | p1p1  | A4:1F:72:11:B4:F1 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:F3 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Node11       |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:03 | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:06 | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:07 | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:09 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3, Intel  82599                     | p1p1  | A4:1F:72:11:B5:0B | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B5:0D | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+| Node12       |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:10 | 10G | Foreman Admin            |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:13 | 10G | Foreman Private/ Storage |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:14 | 10G | Public                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:16 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |  3, TBD                              | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                   |
++--------------+--------------------------------------+-------+-------------------+-----+--------------------------+
  
  Subnet allocations
  ^^^^^^^^^^^^^^^^^^
  
-+-------------------+----------------+-------------------+---------------+----------+
-| Network name      | Address        | Mask              | Gateway       | VLAN id  |
-+-------------------+----------------+-------------------+---------------+----------+
-| Fuel Admin        | 10.20.0.0      |  255.255.0.0      | 10.20.0.1     | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Fuel Mangement    | 192.168.0.0    |  255.255.255.0    | 192.168.0.1   | 101      |
-+-------------------+----------------+-------------------+---------------+----------+
-| Fuel Storage      | 192.168.1.0    |  255.255.255.0    | 192.168.1.1   | 102      |
-+-------------------+----------------+-------------------+---------------+----------+
-| Fuel Public       | 172.18.0.64    |  255.255.255.192  | 172.18.0.65   | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Foreman  Admin    | 10.4.14.0      |  255.255.255.0    | 10.4.14.100   | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Foreman Private   | 10.4.5.0       |  255.255.255.0    | 10.4.5.1      | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Foreman Public    | 172.18.0.0     |  255.255.255.192  | 172.18.0.1    | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Lights Out        | 172.18.0.128   |  255.255.255.128  | 172.18.0.129  | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
++-----------------+--------------+------------------+--------------+----------+
+| Network name    | Address      | Mask             | Gateway      | VLAN id  |
++-----------------+--------------+------------------+--------------+----------+
+| Fuel Admin      | 10.20.0.0    |  255.255.0.0     | 10.20.0.1    | Untagged |
++-----------------+--------------+------------------+--------------+----------+
+| Fuel Mangement  | 192.168.0.0  |  255.255.255.0   | 192.168.0.1  | 101      |
++-----------------+--------------+------------------+--------------+----------+
+| Fuel Storage    | 192.168.1.0  |  255.255.255.0   | 192.168.1.1  | 102      |
++-----------------+--------------+------------------+--------------+----------+
+| Fuel Public     | 172.18.0.64  |  255.255.255.192 | 172.18.0.65  | Untagged |
++-----------------+--------------+------------------+--------------+----------+
+| Foreman  Admin  | 10.4.14.0    |  255.255.255.0   | 10.4.14.100  | Untagged |
++-----------------+--------------+------------------+--------------+----------+
+| Foreman Private | 10.4.5.0     |  255.255.255.0   | 10.4.5.1     | Untagged |
++-----------------+--------------+------------------+--------------+----------+
+| Foreman Public  | 172.18.0.0   |  255.255.255.192 | 172.18.0.1   | Untagged |
++-----------------+--------------+------------------+--------------+----------+
+| Lights Out      | 172.18.0.128 |  255.255.255.128 | 172.18.0.129 | Untagged |
++-----------------+--------------+------------------+--------------+----------+
  
  
  Lights out Network
@@ -287,39 +287,39 @@ Lights out Network
  
  **POD1**
  
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname       | Lights-out address            | MAC              |    Username         | Password            |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Fuel-Jump      | 172.18.1.131                  | A4:1F:72:11:B4:80|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node2          | 172.18.1.132                  | A4:1F:72:11:B4:8D|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node3          | 172.18.1.133                  | A4:1F:72:11:B4:9A|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node4          | 172.18.1.134                  | A4:1F:72:11:B4:A7|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node5          | 172.18.1.135                  | A4:1F:72:11:B4:B4|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node6          | 172.18.1.136                  | A4:1F:72:11:B4:C1|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
++-----------+--------------------+-------------------+-------------+-------------+
+| Hostname  | Lights-out address | MAC               |    Username | Password    |
++-----------+--------------------+-------------------+-------------+-------------+
+| Fuel-Jump | 172.18.1.131       | A4:1F:72:11:B4:80 |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node2     | 172.18.1.132       | A4:1F:72:11:B4:8D |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node3     | 172.18.1.133       | A4:1F:72:11:B4:9A |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node4     | 172.18.1.134       | A4:1F:72:11:B4:A7 |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node5     | 172.18.1.135       | A4:1F:72:11:B4:B4 |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node6     | 172.18.1.136       | A4:1F:72:11:B4:C1 |      root   |      calvin |
++-----------+--------------------+-------------------+-------------+-------------+
  
  **POD2**
  
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname       | Lights-out address            | MAC              |    Username         | Password            |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Foreman-Jump   | 172.18.1.143                  | A4:1F:72:11:B5:1C|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node7          | 172.18.1.137                  | A4:1F:72:11:B4:CE|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node8          | 172.18.1.138                  | A4:1F:72:11:B4:DB|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node9          | 172.18.1.139                  | A4:1F:72:11:B4:E8|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node11         | 172.18.1.141                  | A4:1F:72:11:B5:02|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node12         | 172.18.1.142                  | A4:1F:72:11:B5:0F|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
++--------------+--------------------+-------------------+-------------+-------------+
+| Hostname     | Lights-out address | MAC               |    Username | Password    |
++--------------+--------------------+-------------------+-------------+-------------+
+| Foreman-Jump | 172.18.1.143       | A4:1F:72:11:B5:1C |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
+| Node7        | 172.18.1.137       | A4:1F:72:11:B4:CE |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
+| Node8        | 172.18.1.138       | A4:1F:72:11:B4:DB |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
+| Node9        | 172.18.1.139       | A4:1F:72:11:B4:E8 |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
+| Node11       | 172.18.1.141       | A4:1F:72:11:B5:02 |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
+| Node12       | 172.18.1.142       | A4:1F:72:11:B5:0F |      root   |      calvin |
++--------------+--------------------+-------------------+-------------+-------------+
  
  
  Remote access infrastructure
@@ -362,7 +362,8 @@ Dell OPNFV Testlab
  Overview
  ------------------
  
-Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project
+Dell is hosting an OPNFV testlab at its Santa Clara facility. The testlab would host baremetal
+servers for the use of OPNFV community as part of the OPNFV Pharos Project
  
  
  The Dell Testlab consists of 3 PODs for the use of the community
@@ -386,69 +387,70 @@ Each of the 2 PODs consists of 6 servers that consist of
  Hardware details
  -----------------
  
-For POD1 and POD2,  the servers  reside within a single Dell PowerEdge 620 chassis and have the following specifications:
+For POD1 and POD2,  the servers  reside within a single Dell PowerEdge 620 chassis and have the
+following specifications:
  
  
  
  **POD1**
  
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname            |  Model               | Memory         | Storage      | Processor           | Socket     |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Jump Server         |  Dell PowerEdge M620 | 64 GB          | 1200GB HDD   | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node2               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node3               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node4               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node5               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node6               |  Dell PowerEdge M620 | 64 GB          | 600GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
++-------------+----------------------+--------+------------+---------------------+--------+
+| Hostname    |  Model               | Memory | Storage    | Processor           | Socket |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Jump Server |  Dell PowerEdge M620 | 64 GB  | 1200GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Node2       |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Node3       |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Node4       |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Node5       |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
+| Node6       |  Dell PowerEdge M620 | 64 GB  | 600GB HDD  | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+--------+------------+---------------------+--------+
  
  
  
  
  **POD2**
  
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Hostname            |  Model               |    Memory      | Storage      | Processor           | Socket     |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Jump Server         |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2630 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node7               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node8               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node9               |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node11              |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
-| Node12              |  Dell PowerEdge M620 | 64 GB          | 300GB HDD    | Intel  Xeon E5-2640 |   2        |
-+---------------------+----------------------+----------------+--------------+---------------------+------------+
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Hostname    |  Model               |    Memory | Storage   | Processor           | Socket |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Jump Server |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2630 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Node7       |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Node8       |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Node9       |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Node11      |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
+| Node12      |  Dell PowerEdge M620 | 64 GB     | 300GB HDD | Intel  Xeon E5-2640 |   2    |
++-------------+----------------------+-----------+-----------+---------------------+--------+
  
  
  POD3 consists of 6 R630 Rack servers with the following specifications:
  
  **POD3**
  
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Hostname            |  Model               | Memory          | Storage      | Processor           | Socket     |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Jump Server         |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node2               |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node3               |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node4               |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node5               |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+-----------------+--------------+---------------------+------------+
-| Node6               |  Dell PowerEdge R630 | 128 GB          | 750GB SSD    | Intel  Xeon E5-2698 |   2        |
-+---------------------+----------------------+----------------+---------------+---------------------+------------+
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Hostname    |  Model               | Memory | Storage   | Processor           | Socket |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Jump Server |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Node2       |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Node3       |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Node4       |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Node5       |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
+| Node6       |  Dell PowerEdge R630 | 128 GB | 750GB SSD | Intel  Xeon E5-2698 |   2    |
++-------------+----------------------+--------+-----------+---------------------+--------+
  
  
  
@@ -485,81 +487,81 @@ Networks
     :alt: POD1-Fuel Overview
     :align: left
  
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports|MAC                | BW    | VLANs/Roles                      |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Jump Server         |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:81 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:84 | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:85 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:87 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node2               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:8E | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:91 | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:92 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:94 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:96 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:98 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node3               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:9B | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:9E | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:9F | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:A1 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:A3 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:A5 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node4               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:A8 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:AB | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:AC | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:AE | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:B0 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:B1 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node5               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:B5 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:B8 | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:B9 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:BB | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:BD | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:C0 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node6               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:C2 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:C5 | 10G   | Internal Networks (101-106)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:C6 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:C8 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:CA | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:CD | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Hostname    |  NIC Model                          | Ports | MAC               | BW  | VLANs/Roles                 |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Jump Server |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:81 | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:84 | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:85 | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:87 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node2       |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:8E | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:91 | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:92 | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:94 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:96 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:98 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node3       |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:9B | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:9E | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:9F | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:A1 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:A3 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:A5 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node4       |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:A8 | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:AB | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:AC | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:AE | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Intel  82599                    | p1p1  | A4:1F:72:11:B4:B0 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:B1 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node5       |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:B5 | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:B8 | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:B9 | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:BB | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:BD | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:C0 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node6       |  1, Broadcom  NetXtreme II BCM57810 | em1   | A4:1F:72:11:B4:C2 | 10G | PXE                         |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | em2   | A4:1F:72:11:B4:C5 | 10G | Internal Networks (101-106) |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  2, Intel  82599                    | p3p1  | A4:1F:72:11:B4:C6 | 1G  | Public                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p3p2  | A4:1F:72:11:B4:C8 | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |  3, Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:CA | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
+|             |                                     | p1p2  | A4:1F:72:11:B4:CD | 10G | Unused                      |
++-------------+-------------------------------------+-------+-------------------+-----+-----------------------------+
  
  
  
@@ -572,81 +574,81 @@ Networks
     :align: left
  
  
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports|MAC                | BW    | Roles                            |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Foreman Jump        |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:1D | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:20 | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:21 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:23 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, TBD                                      | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node7               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:CF | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:D2 | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:D3 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:D5 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3,  Broadcom  NetXtreme II BCM57810         | p1p1 | A4:1F:72:11:B4:D7 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:DA | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node8               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:DC | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:DF | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:E0 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:E2 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Broadcom  NetXtreme II BCM57810          | p1p1 | A4:1F:72:11:B4:E4 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:E7 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node9               |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B4:E9 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B4:EC | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B4:ED | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B4:EF | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B4:F1 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:F3 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node11              |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:03 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:06 | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:07 | 10G   | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:09 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  82599                             | p1p1 | A4:1F:72:11:B5:0B | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B5:0D | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Node12              |  1, Broadcom  NetXtreme II BCM57810          | em1  | A4:1F:72:11:B5:10 | 10G   | PXE                              |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | em2  | A4:1F:72:11:B5:13 | 10G   | Internal Networks (201-205)      |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | p3p1 | A4:1F:72:11:B5:14 | 1G    | Public                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p3p2 | A4:1F:72:11:B5:16 | 10G   | Unused                           |
-|                     +----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |  3, TBD                                      | p1p1 | A4:1F:72:11:B4:89 | 10G   | Unused                           |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              | p1p2 | A4:1F:72:11:B4:8B | 10G   | Unused                           |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Hostname     |  NIC Model                           | Ports | MAC               | BW  | Roles                       |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Foreman Jump |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:1D | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:20 | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:21 | 1G  | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:23 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3, TBD                              | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node7        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:CF | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:D2 | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:D3 | 1G  | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:D5 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3,  Broadcom  NetXtreme II BCM57810 | p1p1  | A4:1F:72:11:B4:D7 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:DA | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node8        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:DC | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:DF | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:E0 | 1G  | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:E2 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3, Broadcom  NetXtreme II BCM57810  | p1p1  | A4:1F:72:11:B4:E4 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:E7 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node9        |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B4:E9 | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B4:EC | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B4:ED | 1G  | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B4:EF | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3, Intel  82599                     | p1p1  | A4:1F:72:11:B4:F1 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:F3 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node11       |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:03 | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:06 | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:07 | 10G | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:09 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3, Intel  82599                     | p1p1  | A4:1F:72:11:B5:0B | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B5:0D | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+| Node12       |  1, Broadcom  NetXtreme II BCM57810  | em1   | A4:1F:72:11:B5:10 | 10G | PXE                         |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | em2   | A4:1F:72:11:B5:13 | 10G | Internal Networks (201-205) |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  2, Intel  82599                     | p3p1  | A4:1F:72:11:B5:14 | 1G  | Public                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p3p2  | A4:1F:72:11:B5:16 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |  3, TBD                              | p1p1  | A4:1F:72:11:B4:89 | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
+|              |                                      | p1p2  | A4:1F:72:11:B4:8B | 10G | Unused                      |
++--------------+--------------------------------------+-------+-------------------+-----+-----------------------------+
  
  
  
@@ -663,155 +665,155 @@ Networks
  
  
  
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports|MAC                | BW    |  Roles (VLANs)                   |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Jump Server         |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D7:14:20 | 1G    | PXE                              |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D7:14:22 | 10G   | Internal Networks (201,202,203)  |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D7:14:24 | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Node1               |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D6:F2:98 | 10G   | PXE                              |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D6:F2:9A | 10G   | Internal Networks  (201,202,203) |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D6:F2:9C | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Node2               |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D6:F9:10 | 1G    | PXE                              |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D6:F9:12 | 10G   | Internal Networks (201,202,203)  |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D6:F9:14 | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Node3               |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D7:C9:B8 | 1G    | PXE                              |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D7:C9:BA | 10G   | Internal Networks (201,202,203)  |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D7:C9:BC | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Node4               |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D7:16:E8 | 10G   | PXE                              |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D7:16:EA | 10G   | Internal Networks (201,202,203)  |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D7:16:EA | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-| Node5               |  1, Intel 2P X520/2P I350 rNDC               | em1  | EC:F4:BB:D6:FE:98 | 1G    | Unused                           |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | em2  | EC:F4:BB:D6:FE:9A | 10G   | Internal Networks (201,202,203)  |
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              +------+-------------------+-------+----------------------------------+
-|                     |                                              |      |                   |       |                                  |
-|                     |                                              | p3p1 | EC:F4:BB:D6:FE:9C | 1G    | Public                           |
-|                     |                                              |      |                   |       |                                  |
-+---------------------+----------------------------------------------+------+-------------------+-------+----------------------------------+
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+| Hostname    |  NIC Model                     | Ports | MAC               | BW  |  Roles (VLANs)                   |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Jump Server |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D7:14:20 | 1G  | PXE                              |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D7:14:22 | 10G | Internal Networks (201,202,203)  |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D7:14:24 | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Node1       |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D6:F2:98 | 10G | PXE                              |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D6:F2:9A | 10G | Internal Networks  (201,202,203) |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D6:F2:9C | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Node2       |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D6:F9:10 | 1G  | PXE                              |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D6:F9:12 | 10G | Internal Networks (201,202,203)  |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D6:F9:14 | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Node3       |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D7:C9:B8 | 1G  | PXE                              |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D7:C9:BA | 10G | Internal Networks (201,202,203)  |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D7:C9:BC | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Node4       |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D7:16:E8 | 10G | PXE                              |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D7:16:EA | 10G | Internal Networks (201,202,203)  |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D7:16:EA | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+| Node5       |  1, Intel 2P X520/2P I350 rNDC | em1   | EC:F4:BB:D6:FE:98 | 1G  | Unused                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | em2   | EC:F4:BB:D6:FE:9A | 10G | Internal Networks (201,202,203)  |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
+|             |                                |       |                   |     |                                  |
+|             |                                | p3p1  | EC:F4:BB:D6:FE:9C | 1G  | Public                           |
+|             |                                |       |                   |     |                                  |
++-------------+--------------------------------+-------+-------------------+-----+----------------------------------+
  
  
  **Subnet allocations**
  
-+-------------------+----------------+-------------------+---------------+----------+
-| Network name      | Address        | Mask              | Gateway       | VLAN id  |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD1 Public       | 172.18.0.64    |  255.255.255.192  | 172.18.0.65   | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD2 Public       | 172.18.0.0     |  255.255.255.192  | 172.18.0.1    | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| POD3 Public       | 172.18.1.0     |  255.255.255.0    | 172.18.1.1    | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-| Lights Out        | 172.18.0.128   |  255.255.255.128  | 172.18.0.129  | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
++--------------+--------------+------------------+--------------+----------+
+| Network name | Address      | Mask             | Gateway      | VLAN id  |
++--------------+--------------+------------------+--------------+----------+
+| POD1 Public  | 172.18.0.64  |  255.255.255.192 | 172.18.0.65  | Untagged |
++--------------+--------------+------------------+--------------+----------+
+| POD2 Public  | 172.18.0.0   |  255.255.255.192 | 172.18.0.1   | Untagged |
++--------------+--------------+------------------+--------------+----------+
+| POD3 Public  | 172.18.1.0   |  255.255.255.0   | 172.18.1.1   | Untagged |
++--------------+--------------+------------------+--------------+----------+
+| Lights Out   | 172.18.0.128 |  255.255.255.128 | 172.18.0.129 | Untagged |
++--------------+--------------+------------------+--------------+----------+
  
  
  **Lights out Network**
  
  **POD1**
  
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname       | Lights-out address            | MAC              |    Username         | Password            |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump           | 172.18.0.131                  | A4:1F:72:11:B4:80|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node2          | 172.18.0.132                  | A4:1F:72:11:B4:8D|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node3          | 172.18.0.133                  | A4:1F:72:11:B4:9A|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node4          | 172.18.0.134                  | A4:1F:72:11:B4:A7|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node5          | 172.18.0.135                  | A4:1F:72:11:B4:B4|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node6          | 172.18.0.136                  | A4:1F:72:11:B4:C1|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
++----------+--------------------+-------------------+-------------+-------------+
+| Hostname | Lights-out address | MAC               |    Username | Password    |
++----------+--------------------+-------------------+-------------+-------------+
+| Jump     | 172.18.0.131       | A4:1F:72:11:B4:80 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node2    | 172.18.0.132       | A4:1F:72:11:B4:8D |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node3    | 172.18.0.133       | A4:1F:72:11:B4:9A |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node4    | 172.18.0.134       | A4:1F:72:11:B4:A7 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node5    | 172.18.0.135       | A4:1F:72:11:B4:B4 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node6    | 172.18.0.136       | A4:1F:72:11:B4:C1 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
  
  **POD2**
  
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname       | Lights-out address            | MAC              |    Username         | Password            |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump           | 172.18.0.143                  | A4:1F:72:11:B5:1C|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node7          | 172.18.0.137                  | A4:1F:72:11:B4:CE|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node8          | 172.18.0.138                  | A4:1F:72:11:B4:DB|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node9          | 172.18.0.139                  | A4:1F:72:11:B4:E8|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node11         | 172.18.0.141                  | A4:1F:72:11:B5:02|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node12         | 172.18.0.142                  | A4:1F:72:11:B5:0F|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
++----------+--------------------+-------------------+-------------+-------------+
+| Hostname | Lights-out address | MAC               |    Username | Password    |
++----------+--------------------+-------------------+-------------+-------------+
+| Jump     | 172.18.0.143       | A4:1F:72:11:B5:1C |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node7    | 172.18.0.137       | A4:1F:72:11:B4:CE |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node8    | 172.18.0.138       | A4:1F:72:11:B4:DB |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node9    | 172.18.0.139       | A4:1F:72:11:B4:E8 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node11   | 172.18.0.141       | A4:1F:72:11:B5:02 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node12   | 172.18.0.142       | A4:1F:72:11:B5:0F |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
  
  
  
  **POD3**
  
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Hostname       | Lights-out address            | MAC              |    Username         | Password            |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Jump           | 172.18.0.181                  | 74:E6:E2:FA:BB:D8|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node1          | 172.18.0.182                  | 74:E6:E2:FA:E9:2E|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node2          | 172.18.0.183                  | 74:E6:E2:FA:FC:E2|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node3          | 172.18.0.184                  | 74:E6:E2:FB:05:68|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node4          | 172.18.0.185                  | 74:E6:E2:FA:A4:02|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
-| Node5          | 172.18.0.186                  | 74:E6:E2:FA:E4:18|      root           |      calvin         |
-+----------------+-------------------------------+------------------+---------------------+---------------------+
++----------+--------------------+-------------------+-------------+-------------+
+| Hostname | Lights-out address | MAC               |    Username | Password    |
++----------+--------------------+-------------------+-------------+-------------+
+| Jump     | 172.18.0.181       | 74:E6:E2:FA:BB:D8 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node1    | 172.18.0.182       | 74:E6:E2:FA:E9:2E |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node2    | 172.18.0.183       | 74:E6:E2:FA:FC:E2 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node3    | 172.18.0.184       | 74:E6:E2:FB:05:68 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node4    | 172.18.0.185       | 74:E6:E2:FA:A4:02 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
+| Node5    | 172.18.0.186       | 74:E6:E2:FA:E4:18 |      root   |      calvin |
++----------+--------------------+-------------------+-------------+-------------+
  
  
  Remote access infrastructure
@@ -821,7 +823,8 @@ The Dell OPNFV testlab is free to use for the OPNFV community.
  
  A VPN is used to provide access to the Dell Testlab.
  
-To access the Testlab, please visit the Dell OPNFV Lab's wiki page (https://wiki.opnfv.org/dell_hosting) for details.
+To access the Testlab, please visit the Dell OPNFV Lab's wiki page
+(https://wiki.opnfv.org/dell_hosting) for details.
  
  
  *Accessing the Teslab*
diff --git a/docs/labs/OOL.rst b/docs/labs/OOL.rst

index 09cd896..a4283ab 100644 (file)
--- a/docs/labs/OOL.rst
+++ b/docs/labs/OOL.rst
@@ -3,14 +3,12 @@ OOL (Okinawa Open Laboratory) OPNFV Testlab
  
  Overview
  ------------------
-Okinawa Open Laboratory provides the following facilities for OPNFV testing.
-The testlab is now located only at Okinwa in Japan. ( We have plan to expand PODs and location.)
-The current depoyed version by Fuel installer on the POD is Brahmputra.
-It supports functest, yardstick projects testing. You can connect to CI.
-On each node an OPNFV solution will be installed based on Pharos Lab project.
-On top of this infrastructure several VNFs will be deployed.
-We provide VPN(OpenVPN) to connect the testlab.
-You can check how to connect at “Access Procedure".
+Okinawa Open Laboratory provides the following facilities for OPNFV testing.  The testlab is now
+located only at Okinwa in Japan. ( We have plan to expand PODs and location.) The current depoyed
+version by Fuel installer on the POD is Brahmputra.  It supports functest, yardstick projects
+testing. You can connect to CI.  On each node an OPNFV solution will be installed based on Pharos
+Lab project.  On top of this infrastructure several VNFs will be deployed.  We provide VPN(OpenVPN)
+to connect the testlab.  You can check how to connect at “Access Procedure".
  
  
  Environment
@@ -26,55 +24,55 @@ Servers are deployed in the the following configuration.
  
  * Summary
  
-+------------------------------------------------------------+---------------------------------------------+
-| Node                                                       | Machine                                     |
-+------------------------------------------------------------+---------------------------------------------+
-| Jump server                                                | SuperMicro SYS-5018R-WR                     |
-+------------------------------------------------------------+---------------------------------------------+
-| Controller & Compute Nodes                                 | FUJITSU PRIMERGY RX2530 M1                  |
-+------------------------------------------------------------+---------------------------------------------+
-| Switching 1(for each network except storage)               | Juniper EX3300-24T                          |
-+------------------------------------------------------------+---------------------------------------------+
-| Switching 2(for storage)                                   | Mellanox SX1024                             |
-+------------------------------------------------------------+---------------------------------------------+
++----------------------------------------------+----------------------------+
+| Node                                         | Machine                    |
++----------------------------------------------+----------------------------+
+| Jump server                                  | SuperMicro SYS-5018R-WR    |
++----------------------------------------------+----------------------------+
+| Controller & Compute Nodes                   | FUJITSU PRIMERGY RX2530 M1 |
++----------------------------------------------+----------------------------+
+| Switching 1(for each network except storage) | Juniper EX3300-24T         |
++----------------------------------------------+----------------------------+
+| Switching 2(for storage)                     | Mellanox SX1024            |
++----------------------------------------------+----------------------------+
  
  * Machine Spec
  
-+--------------------------------------+---------------------------+-----+
-| SuperMicro SYS-5018R-WR              |                           |     |
-+--------------------------------------+---------------------------+-----+
-| CPU                                  | Xeon E5-2630v3            | x1  |
-+--------------------------------------+---------------------------+-----+
-| RAM                                  | 32GB                      | -   |
-+--------------------------------------+---------------------------+-----+
-| HDD                                  | SATA 7.2krpm 2TB          | x1  |
-+--------------------------------------+---------------------------+-----+
-| SSD                                  | -                         | -   |
-+--------------------------------------+---------------------------+-----+
-| 1000BASE-T                           | Intel                     | x2  |
-+--------------------------------------+---------------------------+-----+
-| 10GBASE-T                            | Inte                      | x2  |
-+--------------------------------------+---------------------------+-----+
-| BMC                                  | -                         | x1  |
-+--------------------------------------+---------------------------+-----+
-
-+----------------------------------------------+---------------------------+-----+
-| FUJITSU PRIMERGY RX2530 M1                   |                           |     |
-+----------------------------------------------+---------------------------+-----+
-| CPU                                          | Xeon E5-2630v3            | x1  |
-+----------------------------------------------+---------------------------+-----+
-| RAM                                          | 32GB                      | -   |
-+----------------------------------------------+---------------------------+-----+
-| HDD                                          | SATA 7.2krpm 2TB          | x2  |
-+----------------------------------------------+---------------------------+-----+
-| SSD                                          | 100GB                     | x1  |
-+----------------------------------------------+---------------------------+-----+
-| 1000BASE-T                                   | Emulex Skyhawk            | x2  |
-+----------------------------------------------+---------------------------+-----+
-| 10GBASE-T                                    | Intel                     | x2  |
-+----------------------------------------------+---------------------------+-----+
-| BMC                                          | -                         | x1  |
-+----------------------------------------------+---------------------------+-----+
++-------------------------+------------------+----+
+| SuperMicro SYS-5018R-WR |                  |    |
++-------------------------+------------------+----+
+| CPU                     | Xeon E5-2630v3   | x1 |
++-------------------------+------------------+----+
+| RAM                     | 32GB             | -  |
++-------------------------+------------------+----+
+| HDD                     | SATA 7.2krpm 2TB | x1 |
++-------------------------+------------------+----+
+| SSD                     | -                | -  |
++-------------------------+------------------+----+
+| 1000BASE-T              | Intel            | x2 |
++-------------------------+------------------+----+
+| 10GBASE-T               | Inte             | x2 |
++-------------------------+------------------+----+
+| BMC                     | -                | x1 |
++-------------------------+------------------+----+
+
++----------------------------+------------------+----+
+| FUJITSU PRIMERGY RX2530 M1 |                  |    |
++----------------------------+------------------+----+
+| CPU                        | Xeon E5-2630v3   | x1 |
++----------------------------+------------------+----+
+| RAM                        | 32GB             | -  |
++----------------------------+------------------+----+
+| HDD                        | SATA 7.2krpm 2TB | x2 |
++----------------------------+------------------+----+
+| SSD                        | 100GB            | x1 |
++----------------------------+------------------+----+
+| 1000BASE-T                 | Emulex Skyhawk   | x2 |
++----------------------------+------------------+----+
+| 10GBASE-T                  | Intel            | x2 |
++----------------------------+------------------+----+
+| BMC                        | -                | x1 |
++----------------------------+------------------+----+
  
  ---
  
@@ -90,79 +88,79 @@ Servers are deployed in the the following configuration.
  
  Heres are the specifications for the Network Interfaces of servers within POD.
  
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| Hostname         | NIC Model                                  | Ports    | MAC                           | BW      | Role                        |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| OPNFV-Jump       | Intel I350                                 | em1      | 0c:c4:7a:6c:a2:b2             | 1Gb     | Public                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| OPNFV-Jump       | Intel I350                                 | em2      | 0c:c4:7a:6c:a2:b2             | 1Gb     | Admin/Mgmt/Private          |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno1     | 90:1b:0e:6b:e8:a8             | 1Gb     | Admin                       |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno2     | 90:1b:0e:6b:e8:a9             | 1Gb     | Mgmt                        |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno3     | 90:1b:0e:6b:e8:aa             | 1Gb     | Public                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno4     | 90:1b:0e:6b:e8:ab             | 1Gb     | Prvate                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Intel 82599ES                              | ens2f0   | 90:1b:0e:6d:09:71             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-9           | Intel 82599ES                              | ens2f1   | 90:1b:0e:6d:09:72             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno1     | 90:1b:0e:6b:e3:00             | 1Gb     | Admin                       |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno2     | 90:1b:0e:6b:e3:01             | 1Gb     | Mgmt                        |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno3     | 90:1b:0e:6b:e3:02             | 1Gb     | Public                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno4     | 90:1b:0e:6b:e3:03             | 1Gb     | Prvate                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Intel 82599ES                              | ens2f0   | 90:1b:0e:6d:09:5f             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-10          | Intel 82599ES                              | ens2f1   | 90:1b:0e:6d:09:60             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno1     | 90:1b:0e:6b:e5:b4             | 1Gb     | Admin                       |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno2     | 90:1b:0e:6b:e5:b5             | 1Gb     | Mgmt                        |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno3     | 90:1b:0e:6b:e5:b6             | 1Gb     | Public                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno4     | 90:1b:0e:6b:e5:b7             | 1Gb     | Prvate                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Intel 82599ES                              | ens2f0   | 90:1b:0e:6d:09:6f             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-11          | Intel 82599ES                              | ens2f1   | 90:1b:0e:6d:09:70             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno1     | 90:1b:0e:6b:e2:bc             | 1Gb     | Admin                       |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno2     | 90:1b:0e:6b:e2:bd             | 1Gb     | Mgmt                        |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno3     | 90:1b:0e:6b:e2:be             | 1Gb     | Public                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Emulex OneConnect NIC (Skyhawk) (onboard)  | eno4     | 90:1b:0e:6b:e2:bf             | 1Gb     | Prvate                      |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Intel 82599ES                              | ens2f0   | 90:1b:0e:6d:08:31             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
-| node-12          | Intel 82599ES                              | ens2f1   | 90:1b:0e:6d:08:32             | 10Gb    | Storage                     |
-+------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| Hostname   | NIC Model                                 | Ports  | MAC               | BW   | Role               |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| OPNFV-Jump | Intel I350                                | em1    | 0c:c4:7a:6c:a2:b2 | 1Gb  | Public             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| OPNFV-Jump | Intel I350                                | em2    | 0c:c4:7a:6c:a2:b2 | 1Gb  | Admin/Mgmt/Private |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Emulex OneConnect NIC (Skyhawk) (onboard) | eno1   | 90:1b:0e:6b:e8:a8 | 1Gb  | Admin              |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Emulex OneConnect NIC (Skyhawk) (onboard) | eno2   | 90:1b:0e:6b:e8:a9 | 1Gb  | Mgmt               |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Emulex OneConnect NIC (Skyhawk) (onboard) | eno3   | 90:1b:0e:6b:e8:aa | 1Gb  | Public             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Emulex OneConnect NIC (Skyhawk) (onboard) | eno4   | 90:1b:0e:6b:e8:ab | 1Gb  | Prvate             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Intel 82599ES                             | ens2f0 | 90:1b:0e:6d:09:71 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-9     | Intel 82599ES                             | ens2f1 | 90:1b:0e:6d:09:72 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno1   | 90:1b:0e:6b:e3:00 | 1Gb  | Admin              |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno2   | 90:1b:0e:6b:e3:01 | 1Gb  | Mgmt               |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno3   | 90:1b:0e:6b:e3:02 | 1Gb  | Public             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno4   | 90:1b:0e:6b:e3:03 | 1Gb  | Prvate             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Intel 82599ES                             | ens2f0 | 90:1b:0e:6d:09:5f | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-10    | Intel 82599ES                             | ens2f1 | 90:1b:0e:6d:09:60 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno1   | 90:1b:0e:6b:e5:b4 | 1Gb  | Admin              |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno2   | 90:1b:0e:6b:e5:b5 | 1Gb  | Mgmt               |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno3   | 90:1b:0e:6b:e5:b6 | 1Gb  | Public             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno4   | 90:1b:0e:6b:e5:b7 | 1Gb  | Prvate             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Intel 82599ES                             | ens2f0 | 90:1b:0e:6d:09:6f | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-11    | Intel 82599ES                             | ens2f1 | 90:1b:0e:6d:09:70 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno1   | 90:1b:0e:6b:e2:bc | 1Gb  | Admin              |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno2   | 90:1b:0e:6b:e2:bd | 1Gb  | Mgmt               |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno3   | 90:1b:0e:6b:e2:be | 1Gb  | Public             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Emulex OneConnect NIC (Skyhawk) (onboard) | eno4   | 90:1b:0e:6b:e2:bf | 1Gb  | Prvate             |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Intel 82599ES                             | ens2f0 | 90:1b:0e:6d:08:31 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
+| node-12    | Intel 82599ES                             | ens2f1 | 90:1b:0e:6d:08:32 | 10Gb | Storage            |
++------------+-------------------------------------------+--------+-------------------+------+--------------------+
  
  * Subnet Allocations
  
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Network name           | Address            | Mask                  | Gateway              | VLAN id     |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Public                 | 192.168.25.0       | 255.255.255.0         | 192.168.25.254       | 103         |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Fuel Admin             | 192.168.103.0      | 255.255.255.0         | 192.168.103.1        | 103         |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Fuel Mangement         | 192.168.104.0      | 255.255.255.0         | 192.168.104.1        | 104         |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Fuel Public            | 192.168.105.0      | 255.255.255.0         | 192.168.105.1        | 105         |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Fuel Private           | 192.168.106.0      | 255.255.255.0         |                      | Untagged    |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
-| Fuel Storage           | 192.168.107.0      | 255.255.255.0         |                      | Untagged    |
-+------------------------+--------------------+-----------------------+----------------------+-------------+
++----------------+---------------+---------------+----------------+----------+
+| Network name   | Address       | Mask          | Gateway        | VLAN id  |
++----------------+---------------+---------------+----------------+----------+
+| Public         | 192.168.25.0  | 255.255.255.0 | 192.168.25.254 | 103      |
++----------------+---------------+---------------+----------------+----------+
+| Fuel Admin     | 192.168.103.0 | 255.255.255.0 | 192.168.103.1  | 103      |
++----------------+---------------+---------------+----------------+----------+
+| Fuel Mangement | 192.168.104.0 | 255.255.255.0 | 192.168.104.1  | 104      |
++----------------+---------------+---------------+----------------+----------+
+| Fuel Public    | 192.168.105.0 | 255.255.255.0 | 192.168.105.1  | 105      |
++----------------+---------------+---------------+----------------+----------+
+| Fuel Private   | 192.168.106.0 | 255.255.255.0 |                | Untagged |
++----------------+---------------+---------------+----------------+----------+
+| Fuel Storage   | 192.168.107.0 | 255.255.255.0 |                | Untagged |
++----------------+---------------+---------------+----------------+----------+
  
  ---
  
@@ -170,7 +168,8 @@ Heres are the specifications for the Network Interfaces of servers within POD.
  Access Procedure
  ------------------
  
-This environment is free to use by any OPNFV contributor or committer for the purpose of OPNFV approved activities. Access to this environment can be granted by sending a e-mail to: TBD
+This environment is free to use by any OPNFV contributor or committer for the purpose of OPNFV
+approved activities. Access to this environment can be granted by sending a e-mail to: TBD
  
  subject: opnfv_access_ool
  
diff --git a/docs/labs/ZTE.rst b/docs/labs/ZTE.rst

index b6b0457..e234821 100644 (file)
--- a/docs/labs/ZTE.rst
+++ b/docs/labs/ZTE.rst
@@ -4,7 +4,8 @@ ZTE OPNFV Testlab
  Overview
  ------------------
  
-ZTE is hosting an OPNFV testlab at Nanjing facility. The testlab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project.
+ZTE is hosting an OPNFV testlab at Nanjing facility. The testlab would host baremetal servers for
+the use of OPNFV community as part of the OPNFV Pharos Project.
  
  The ZTE Testlab consists of 1 POD
      * POD for Fuel
@@ -50,113 +51,113 @@ The specifications for the servers within POD can be found below:
  
  The specifications for the Network Interfaces of servers within POD can be seen below:
  
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-| Hostname            |  NIC Model                                   | Ports    | MAC               | BW    | Roles                            |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Fuel Jump            |  1, RTL8111/8168/8411                        | enp8s0   | 98:f5:37:e1:b4:1b | 10G   | mgmt                             |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | enp9s0   | 98:f5:37:e1:b4:1c | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Inel 82599                               | enp3s0f0 | 90:e2:ba:8b:08:64 | 10G   | Unused                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | enp3s0f1 | 90:e2:ba:8b:08:65 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node10               |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:18 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:19 | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:1a | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:1b | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:d8 | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:d9 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node11               |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:3c | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:3d | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:3e | 10G   | Storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:3f | 10G   | Storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:5a:d4 | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:5a:d5 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node12               |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:08 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:09 | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:0a | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:0b | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:bd | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:be | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node4                |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:1c | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:1d | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:1e | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:1f | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:a2 | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:a3 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node5                |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:24 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:25 | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:26 | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:27 | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:ab | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:ac | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node6                |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:40 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:41 | 10G   | Public                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:42 | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:43 | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:fc | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:fd | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node13               |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:38 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:39 | 10G   | Unused                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:3a | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:3b | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:87 | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:88 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|Node14               |  1, Intel  82599                             | eth0     | 4c:09:b4:b1:de:48 | 10G   | Public                           |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth1     | 4c:09:b4:b1:de:49 | 10G   | Unused                           |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  2, Intel  82599                             | eth2     | 4c:09:b4:b1:de:4a | 10G   | storage                          |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth3     | 4c:09:b4:b1:de:4b | 10G   | storage                          |
-|                     +----------------------------------------------+----------+-------------------+-------+----------------------------------+
-|                     |  3, Intel  I350                              | eth4     | 4c:09:b4:b2:59:75 | 10G   | Admin/mgmt                       |
-|                     |                                              +----------+-------------------+-------+----------------------------------+
-|                     |                                              | eth5     | 4c:09:b4:b2:59:76 | 10G   | Unused                           |
-+---------------------+----------------------------------------------+----------+-------------------+-------+----------------------------------+
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Hostname  |  NIC Model            | Ports    | MAC               | BW  | Roles      |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Fuel Jump |  1, RTL8111/8168/8411 | enp8s0   | 98:f5:37:e1:b4:1b | 10G | mgmt       |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | enp9s0   | 98:f5:37:e1:b4:1c | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Inel 82599        | enp3s0f0 | 90:e2:ba:8b:08:64 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | enp3s0f1 | 90:e2:ba:8b:08:65 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node10    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:18 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:19 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:1a | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:1b | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:d8 | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:d9 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node11    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:3c | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:3d | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:3e | 10G | Storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:3f | 10G | Storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:5a:d4 | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:5a:d5 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node12    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:08 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:09 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:0a | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:0b | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:bd | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:be | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node4     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:1c | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:1d | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:1e | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:1f | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:a2 | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:a3 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node5     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:24 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:25 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:26 | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:27 | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:ab | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:ac | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node6     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:40 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:41 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:42 | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:43 | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:fc | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:fd | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node13    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:38 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:39 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:3a | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:3b | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:87 | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:88 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+| Node14    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:48 | 10G | Public     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth1     | 4c:09:b4:b1:de:49 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:4a | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth3     | 4c:09:b4:b1:de:4b | 10G | storage    |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:75 | 10G | Admin/mgmt |
++-----------+-----------------------+----------+-------------------+-----+------------+
+|           |                       | eth5     | 4c:09:b4:b2:59:76 | 10G | Unused     |
++-----------+-----------------------+----------+-------------------+-----+------------+
  
  
  Software
@@ -165,8 +166,8 @@ Software
  The Jump servers in the Testlab are pre-provisioned with the following software:
  
     * Fuel-Jump Server:
-            1. OS: CentOS
-            2. Preprovisoned softwares: KVM, VNC server
+        1. OS: CentOS
+        2. Preprovisoned softwares: KVM, VNC server
  
  
  
@@ -175,17 +176,17 @@ Networks
  
  **Subnet allocations**
  
-+-------------------+----------------+-------------------+---------------+----------+
-| Network name      | Address        | Mask              | Gateway       | VLAN id  |
-+-------------------+----------------+-------------------+---------------+----------+
-| Public            |172.10.0.0      |  255.255.255.0    | 172.10.0.1    | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-|Fuel Admin         |192.168.0.0     |  255.255.255.0    | 192.168.0.1   | Untagged |
-+-------------------+----------------+-------------------+---------------+----------+
-|Fuel Mangement     |192.168.11.0    |  255.255.255.0    |               | 101      |
-+-------------------+----------------+-------------------+---------------+----------+
-|Fuel Storage       |192.168.12.0    |  255.255.255.0    |               | 102      |
-+-------------------+----------------+-------------------+---------------+----------+
++----------------+--------------+----------------+-------------+----------+
+| Network name   | Address      | Mask           | Gateway     | VLAN id  |
++----------------+--------------+----------------+-------------+----------+
+| Public         | 172.10.0.0   |  255.255.255.0 | 172.10.0.1  | Untagged |
++----------------+--------------+----------------+-------------+----------+
+| Fuel Admin     | 192.168.0.0  |  255.255.255.0 | 192.168.0.1 | Untagged |
++----------------+--------------+----------------+-------------+----------+
+| Fuel Mangement | 192.168.11.0 |  255.255.255.0 |             | 101      |
++----------------+--------------+----------------+-------------+----------+
+| Fuel Storage   | 192.168.12.0 |  255.255.255.0 |             | 102      |
++----------------+--------------+----------------+-------------+----------+
  
  
  **Lights out Network**
@@ -222,7 +223,8 @@ Remote access infrastructure
  
  The ZTE OPNFV testlab is free to use for the OPNFV community.
  
-A VPN is used to provide access to the ZTE Testlab. Details can be found in *ZTE OPNFV-lab Access* document (Attach link)
+A VPN is used to provide access to the ZTE Testlab. Details can be found in *ZTE OPNFV-lab Access*
+document (Attach link)
  
  To access the Testlab, please contact Zhihui Wu(wu.zhihui1@zte.com.cn) with the following details:
   * Name
diff --git a/docs/labs/huawei-us-lab/huawei-us-lab.rst b/docs/labs/huawei-us-lab/huawei-us-lab.rst

index 13bb8e5..fe7b0d3 100644 (file)
--- a/docs/labs/huawei-us-lab/huawei-us-lab.rst
+++ b/docs/labs/huawei-us-lab/huawei-us-lab.rst
@@ -2,10 +2,10 @@
  Introduction of Huawei's lab located in Santa Clara
  ===================================================
  
-Huawei's lab located in Santa Clara, CA will provide 1 full POD for baremetal deployment environment, 2
-standalone server for virtual deployment, and 1 server with 6 executors for project's building and gate-testing.
-All the resources have been attached to Jenkins master, you can view the slaves below
-in https://build.opnfv.org/ci/:
+Huawei's lab located in Santa Clara, CA will provide 1 full POD for baremetal deployment
+environment, 2 standalone server for virtual deployment, and 1 server with 6 executors for project's
+building and gate-testing.  All the resources have been attached to Jenkins master, you can view the
+slaves below in https://build.opnfv.org/ci/:
  
  * huawei-us-build-1
  * huawei-us-deploy-vm-1
@@ -18,8 +18,10 @@ Overall Description
  Hardware
  --------
  
-* 9 Huawei RH2285H V2 Rack Servers (128 GB RAM , 4.7 TB SATA SSDs, two Intel Xeon E5-2400 v2 series processors)
-* 1 Huawei S9300 10G switch for storage, management and public traffic - 2x10GE to each server.
+* 9 Huawei RH2285H V2 Rack Servers (128 GB RAM , 4.7 TB SATA SSDs, two Intel Xeon E5-2400 v2 series
+  processors)
+* 1 Huawei S9300 10G switch for storage, management and public traffic - 2x10GE to
+  each server.
  * 1 Huawei S5300 1G switch for installing and Lights+out management traffic - 2x1GE to each server.
  * 1 VPN concentrator for remote access and management.
  * 1 Huawei firewall and router for public network secure access.
@@ -57,32 +59,33 @@ Figure 2: Full Pod network configuration
  Build Resource
  ^^^^^^^^^^^^^^
  
-You can see the slaves named "huawei-us-build-[digit]" or "huawei-build-[digit]" in https://build.opnfv.org/ci/
+You can see the slaves named "huawei-us-build-[digit]" or "huawei-build-[digit]" in
+https://build.opnfv.org/ci/
  
-These resources are dedicated to CI. If you want to use Huawei resource to run some automated jobs, you do
-not need to apply for the credentials, just specify the node as "huawei-build" . For other purposes, please
-contact: [[weidong.shao@huawei.com]]
+These resources are dedicated to CI. If you want to use Huawei resource to run some automated jobs,
+you do not need to apply for the credentials, just specify the node as "huawei-build" . For other
+purposes, please contact: [[weidong.shao@huawei.com]]
  
  
  Deployment Resource
  ^^^^^^^^^^^^^^^^^^^
  
-You can see the slaves named "huawei-us-deploy-vm/bare-[digit]" or "huawei-deploy-vm/bare-[digit]" in
-https://build.opnfv.org/ci/
+You can see the slaves named "huawei-us-deploy-vm/bare-[digit]" or "huawei-deploy-vm/bare-[digit]"
+in https://build.opnfv.org/ci/
  
-We have two types of deployment resources, virtual deployment environment and baremetal deployment environment.
-Both can be deployed by any types of installer, and provide the same testbed for testing and the same
-infrastructure for VNF.
+We have two types of deployment resources, virtual deployment environment and baremetal deployment
+environment.  Both can be deployed by any types of installer, and provide the same testbed for
+testing and the same infrastructure for VNF.
  
-You can access our deployment resources by applying for the VPN credentials, please see the section below
-for details.
+You can access our deployment resources by applying for the VPN credentials, please see the section
+below for details.
  
  
  Access
  ======
  
-This environment is free to use by any OPNFV contributor or committer for the purpose of OPNFV approved
-activities, you just need to obtain VPN credentials to access.
+This environment is free to use by any OPNFV contributor or committer for the purpose of OPNFV
+approved activities, you just need to obtain VPN credentials to access.
  
  Access to this environment can be granted by sending a e-mail to:
    * [[weidong.shao@huawei.com]]
diff --git a/docs/labs/orange_paris_lab_description.rst b/docs/labs/orange_paris_lab_description.rst

index f22d90f..c59ec2a 100644 (file)
--- a/docs/labs/orange_paris_lab_description.rst
+++ b/docs/labs/orange_paris_lab_description.rst
@@ -8,8 +8,8 @@ Lab Specification Template
  Introduction
  ------------
  
-Orange is hosting an OPNFV test lab at Chatillon (near Paris) facility.
-The test lab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project.
+Orange is hosting an OPNFV test lab at Chatillon (near Paris) facility.  The test lab would host
+baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project.
  
  The Orange Paris lab consist of 1 POD
      * POD for Fuel
@@ -18,11 +18,11 @@ The Orange Paris lab consist of 1 POD
  Lab Resources
  -------------
  
-+----------------+----------------+----------------+----------------+----------------+----------------+----------------+
-| POD Name       | Project(s)     | Project Lead(s)| Email(s)       |  POD Role      |  Status        | Notes          |
-+----------------+----------------+----------------+----------------+----------------+----------------+----------------+
-| opnfv-integ    |                |                |                |  Dev/test      |  Active        |                |
-+----------------+----------------+----------------+----------------+----------------+----------------+----------------+
++-------------+------------+-----------------+----------+-----------+---------+-------+
+| POD Name    | Project(s) | Project Lead(s) | Email(s) |  POD Role |  Status | Notes |
++-------------+------------+-----------------+----------+-----------+---------+-------+
+| opnfv-integ |            |                 |          |  Dev/test |  Active |       |
++-------------+------------+-----------------+----------+-----------+---------+-------+
  
  * **POD Name:** Use consistent naming / numbering to avoid confusion. Hyperlinked to POD description.
  * **POD Role:** CI stable, CI latest, Dev/test, Stand-alone, Virtual, ...
@@ -42,8 +42,9 @@ The Orange Paris OPNFV test lab is free to use for the OPNFV community.
  
  A VPN is used to provide access to the Orange Paris Testlab.
  
-To access the Testlab, please contact Auboin Cyril (cyril.auboin@orange.com) with the following details:
- * Name
+To access the Testlab, please contact Auboin Cyril (cyril.auboin@orange.com) with the following
+details:
+* Name
   * Organization
   * Purpose of using the labs
   * Dates start / end
@@ -54,7 +55,8 @@ Processing the request can take 3-4 business days.
  Remote Access Procedure
  -----------------------
  
-Define lab process for requesting access to the lab (e.g. VPN guide, how to modify BIOS settings, etc.)
+Define lab process for requesting access to the lab (e.g. VPN guide, how to modify BIOS settings,
+etc.)
  
  
  Lab Documentation
@@ -66,8 +68,8 @@ List lab specific documents here
  Lab Topology
  ------------
  
-Provide a diagram showing the network topology of lab including lights-out network. Any security sensitive details should
-not be exposed publically. The following diagram is an example only.
+Provide a diagram showing the network topology of lab including lights-out network. Any security
+sensitive details should not be exposed publically. The following diagram is an example only.
  
  .. image:: ./images/orange_paris_pod1.jpg
     :alt: Lab diagram not found
diff --git a/docs/labs/orange_paris_pod1_description.rst b/docs/labs/orange_paris_pod1_description.rst

index 59dde96..65dea32 100644 (file)
--- a/docs/labs/orange_paris_pod1_description.rst
+++ b/docs/labs/orange_paris_pod1_description.rst
@@ -8,8 +8,9 @@ POD Specification Template
  Introduction
  ------------
  
-Orange is hosting an OPNFV test lab at Chatillon (near Paris) facility.
-The test lab would host 4 (1 controller and 3 computes) baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project.
+Orange is hosting an OPNFV test lab at Chatillon (near Paris) facility.  The test lab would host 4
+(1 controller and 3 computes) baremetal servers for the use of OPNFV community as part of the OPNFV
+Pharos Project.
  
  Version: Brahmaputra
  Installer: Fuel (with Ceph)
@@ -22,106 +23,107 @@ Server Specifications
  
  **Switch**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-        |  JUNIPER     | EX-4550      | 750-045407   |              |              |              | 172.31.2.254           |                        |                        | 32 ports     |
-| switch       |              |              |              |              |              |              | CC:E1:7F:86:38:80      |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++-----------+----------+---------+---------------+-------+--------+---------+---------------------+------------------+------------------+----------+
+|           |          |         |               |       |        | Local   | Lights-out network  | 1GbE: NIC#/IP    | 10GbE: NIC#/IP   |          |
+|  Hostname |  Vendor  | Model   | Serial Number |  CPUs | Memory | storage | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes    |
++-----------+----------+---------+---------------+-------+--------+---------+---------------------+------------------+------------------+----------+
+| pod1-     |  JUNIPER | EX-4550 | 750-045407    |       |        |         | 172.31.2.254        |                  |                  | 32 ports |
+| switch    |          |         |               |       |        |         | CC:E1:7F:86:38:80   |                  |                  |          |
+|           |          |         |               |       |        |         |                     |                  |                  |          |
++-----------+----------+---------+---------------+-------+--------+---------+---------------------+------------------+------------------+----------+
  
  **Jump Host**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-        |  DELL        | Proliant     |  CZJ40901PV  |  Intel Xeon  |  16 GB       | 300GB SAS    |                        | IF0: 172.31.13.5       |                        |              |
-| jump-host    |              | DL 360e      |              | E5-2430 v2.2 |              | 300GB SAS    |                        |                        |                        |              |
-|              |              | Gen8         |              |2,5Ghz 24 core|              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++-----------+---------+----------+---------------+----------------+--------+-----------+---------------------+------------------+------------------+-------+
+|           |         |          |               |                |        | Local     | Lights-out network  | 1GbE: NIC#/IP    | 10GbE: NIC#/IP   |       |
+|  Hostname |  Vendor | Model    | Serial Number |  CPUs          | Memory | storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
++-----------+---------+----------+---------------+----------------+--------+-----------+---------------------+------------------+------------------+-------+
+| pod1-     |  DELL   | Proliant |  CZJ40901PV   |  Intel Xeon    |  16 GB | 300GB SAS |                     | IF0: 172.31.13.5 |                  |       |
+| jump-host |         | DL 360e  |               | E5-2430 v2.2   |        | 300GB SAS |                     |                  |                  |       |
+|           |         | Gen8     |               | 2,5Ghz 24 core |        |           |                     |                  |                  |       |
++-----------+---------+----------+---------------+----------------+--------+-----------+---------------------+------------------+------------------+-------+
  
  **Firewall**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-        |  IBM         | @Server      |              |  Intel Xeon  |   4 GB       | 36GB SATA    |                        | IF0: 161.105.211.2     |                        |              |
-| firewall     |              | xSerie 336   |  KKTVY4M     |              |              | 36GB SATA    |                        |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++-----------+---------+------------+---------------+-------------+--------+-----------+---------------------+--------------------+------------------+-------+
+|           |         |            |               |             |        | Local     | Lights-out network  | 1GbE: NIC#/IP      | 10GbE: NIC#/IP   |       |
+|  Hostname |  Vendor | Model      | Serial Number |  CPUs       | Memory | storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network   | MAC/VLAN/Network | Notes |
++-----------+---------+------------+---------------+-------------+--------+-----------+---------------------+--------------------+------------------+-------+
+| pod1-     |  IBM    | @Server    |               |  Intel Xeon |   4 GB | 36GB SATA |                     | IF0: 161.105.211.2 |                  |       |
+| firewall  |         | xSerie 336 |  KKTVY4M      |             |        | 36GB SATA |                     |                    |                  |       |
+|           |         |            |               |             |        |           |                     |                    |                  |       |
++-----------+---------+------------+---------------+-------------+--------+-----------+---------------------+--------------------+------------------+-------+
  
  **Controller Node**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-ctrl1   |  HP          |  Proliant    |  CZJ40901PT  |  Intel Xeon  |     16GB     | 300GB SAS    |                        | IF0: 9C:B6:54:95:E4:74 |                        |              |
-|              |              |  DL 360e     |              | E5-2430 v2.2 |              | 300GB SAS    |                        |      Admin             |                        |              |
-|              |              |  Gen8        |              |    2,5Ghz    |              |              |                        | IF1: 9C:B6:54:95:E4:75 |                        |              |
-|              |              |              |              |    24 core   |              |              |                        |      18: Public        |                        |              |
-|              |              |              |              |              |              |              |                        |      1500: Storage     |                        |              |
-|              |              |              |              |              |              |              |                        |      17: Management    |                        |              |
-|              |              |              |              |              |              |              |                        |      1502: Private     |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++------------+---------+-----------+---------------+--------------+----------+-----------+---------------------+------------------------+------------------+-------+
+|            |         |           |               |              |          | Local     | Lights-out network  | 1GbE: NIC#/IP          | 10GbE: NIC#/IP   |       |
+|  Hostname  |  Vendor | Model     | Serial Number |  CPUs        | Memory   | storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network       | MAC/VLAN/Network | Notes |
++------------+---------+-----------+---------------+--------------+----------+-----------+---------------------+------------------------+------------------+-------+
+| pod1-ctrl1 |  HP     |  Proliant |  CZJ40901PT   |  Intel Xeon  |     16GB | 300GB SAS |                     | IF0: 9C:B6:54:95:E4:74 |                  |       |
+|            |         |  DL 360e  |               | E5-2430 v2.2 |          | 300GB SAS |                     |      Admin             |                  |       |
+|            |         |  Gen8     |               |    2,5Ghz    |          |           |                     | IF1: 9C:B6:54:95:E4:75 |                  |       |
+|            |         |           |               |    24 core   |          |           |                     |      18: Public        |                  |       |
+|            |         |           |               |              |          |           |                     |      1500: Storage     |                  |       |
+|            |         |           |               |              |          |           |                     |      17: Management    |                  |       |
+|            |         |           |               |              |          |           |                     |      1502: Private     |                  |       |
++------------+---------+-----------+---------------+--------------+----------+-----------+---------------------+------------------------+------------------+-------+
  
  **Compute Nodes**
  
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-node1   |  DELL        |  R730        |  8F3J642     |  Intel Xeon  |  128GB       | 250GB SATA   |                        | IF0: EC:F4:BB:CB:62:9C |                        |              |
-|              |              |              |              |  E5-2603 v3  |  (8x16GB)    | 480GB SSD    |                        |      Admin             |                        |              |
-|              |              |              |              |    1,6Ghz    |  1600Mhz     | 480GB SSD    |                        | IF1: EC:F4:BB:CB:62:9A |                        |              |
-|              |              |              |              |    12 core   |              |              |                        |      18: Public        |                        |              |
-|              |              |              |              |              |              |              |                        |      1500: Storage     |                        |              |
-|              |              |              |              |              |              |              |                        |      17: Management    |                        |              |
-|              |              |              |              |              |              |              |                        |      1502: Private     |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-node2   |  HP          |  Proliant    |  CZJ40901PS  |  Intel Xeon  |  16GB        | 300GB SAS    |                        | IF0: 9C:B6:54:95:D4:F0 |                        |              |
-|              |              |  DL 360e     |              | E5-2430 v2.2 |              | 300GB SAS    |                        |      Admin             |                        |              |
-|              |              |  Gen8        |              |    2,5Ghz    |              |              |                        | IF1: 9C:B6:54:95:D4:F1 |                        |              |
-|              |              |              |              |    24 core   |              |              |                        |      18: Public        |                        |              |
-|              |              |              |              |              |              |              |                        |      1500: Storage     |                        |              |
-|              |              |              |              |              |              |              |                        |      17: Management    |                        |              |
-|              |              |              |              |              |              |              |                        |      1502: Private     |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-node3   |  DELL        |  R730        |  FG3J642     |  Intel Xeon  |  128GB       | 256GB SATA   |                        | IF0: EC:F4:BB:CB:62:E4 |                        |              |
-|              |              |              |              |  E5-2603 v3  |  (8x16GB)    | 480GB SSD    |                        |      Admin             |                        |              |
-|              |              |              |              |    1,6Ghz    |  1600Mhz     | 480GB SSD    |                        | IF1: EC:F4:BB:CB:62:E2 |                        |              |
-|              |              |              |              |    12 core   |              |              |                        |      18: Public        |                        |              |
-|              |              |              |              |              |              |              |                        |      1500: Storage     |                        |              |
-|              |              |              |              |              |              |              |                        |      17: Management    |                        |              |
-|              |              |              |              |              |              |              |                        |      1502: Private     |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
++------------+---------+-----------+---------------+--------------+-----------+------------+---------------------+------------------------+------------------+-------+
+|            |         |           |               |              |           | Local      | Lights-out network  | 1GbE: NIC#/IP          | 10GbE: NIC#/IP   |       |
+|  Hostname  |  Vendor | Model     | Serial Number |  CPUs        | Memory    | storage    | (IPMI): IP/MAC, U/P | MAC/VLAN/Network       | MAC/VLAN/Network | Notes |
++------------+---------+-----------+---------------+--------------+-----------+------------+---------------------+------------------------+------------------+-------+
+| pod1-node1 |  DELL   |  R730     |  8F3J642      |  Intel Xeon  |  128GB    | 250GB SATA |                     | IF0: EC:F4:BB:CB:62:9C |                  |       |
+|            |         |           |               |  E5-2603 v3  |  (8x16GB) | 480GB SSD  |                     |      Admin             |                  |       |
+|            |         |           |               |    1,6Ghz    |  1600Mhz  | 480GB SSD  |                     | IF1: EC:F4:BB:CB:62:9A |                  |       |
+|            |         |           |               |    12 core   |           |            |                     |      18: Public        |                  |       |
+|            |         |           |               |              |           |            |                     |      1500: Storage     |                  |       |
+|            |         |           |               |              |           |            |                     |      17: Management    |                  |       |
+|            |         |           |               |              |           |            |                     |      1502: Private     |                  |       |
++------------+---------+-----------+---------------+--------------+-----------+------------+---------------------+------------------------+------------------+-------+
+| pod1-node2 |  HP     |  Proliant |  CZJ40901PS   |  Intel Xeon  |  16GB     | 300GB SAS  |                     | IF0: 9C:B6:54:95:D4:F0 |                  |       |
+|            |         |  DL 360e  |               | E5-2430 v2.2 |           | 300GB SAS  |                     |      Admin             |                  |       |
+|            |         |  Gen8     |               |    2,5Ghz    |           |            |                     | IF1: 9C:B6:54:95:D4:F1 |                  |       |
+|            |         |           |               |    24 core   |           |            |                     |      18: Public        |                  |       |
+|            |         |           |               |              |           |            |                     |      1500: Storage     |                  |       |
+|            |         |           |               |              |           |            |                     |      17: Management    |                  |       |
+|            |         |           |               |              |           |            |                     |      1502: Private     |                  |       |
++------------+---------+-----------+---------------+--------------+-----------+------------+---------------------+------------------------+------------------+-------+
+| pod1-node3 |  DELL   |  R730     |  FG3J642      |  Intel Xeon  |  128GB    | 256GB SATA |                     | IF0: EC:F4:BB:CB:62:E4 |                  |       |
+|            |         |           |               |  E5-2603 v3  |  (8x16GB) | 480GB SSD  |                     |      Admin             |                  |       |
+|            |         |           |               |    1,6Ghz    |  1600Mhz  | 480GB SSD  |                     | IF1: EC:F4:BB:CB:62:E2 |                  |       |
+|            |         |           |               |    12 core   |           |            |                     |      18: Public        |                  |       |
+|            |         |           |               |              |           |            |                     |      1500: Storage     |                  |       |
+|            |         |           |               |              |           |            |                     |      17: Management    |                  |       |
+|            |         |           |               |              |           |            |                     |      1502: Private     |                  |       |
++------------+---------+-----------+---------------+--------------+-----------+------------+---------------------+------------------------+------------------+-------+
  
  Users
  -----
  
-+------------------+-----------------------------+--------------+--------------+--------------+
-| Name             | Email                       | Company      | Role         | Notes        |
-+------------------+-----------------------------+--------------+--------------+--------------+
-|                  |                             |              |              |              |
-+------------------+-----------------------------+--------------+--------------+--------------+
++------+-------+---------+------+-------+
+| Name | Email | Company | Role | Notes |
++------+-------+---------+------+-------+
+|      |       |         |      |       |
++------+-------+---------+------+-------+
  
  Firewall Rules
  --------------
  
-+--------------+--------------+--------------+
-| Port(s)      | Service      | Note         |
-+--------------+--------------+--------------+
-| 22, 43, 80   | Jenkins CI   |              |
-+--------------+--------------+--------------+
++------------+------------+------+
+| Port(s)    | Service    | Note |
++------------+------------+------+
+| 22, 43, 80 | Jenkins CI |      |
++------------+------------+------+
  
  POD Topology
  ------------
  
-Provide a diagram showing the network topology of the POD. Any security sensitive details should
-not be exposed publically and can be stored in the secure Pharos repo. The following diagram is an example only.
+Provide a diagram showing the network topology of the POD. Any security sensitive details should not
+be exposed publically and can be stored in the secure Pharos repo. The following diagram is an
+example only.
  
  .. image:: ./images/orange_paris_pod1.jpg
     :alt: POD diagram not found
diff --git a/docs/labs/spirent.rst b/docs/labs/spirent.rst

index b0ba0ba..2c6a0cf 100644 (file)
--- a/docs/labs/spirent.rst
+++ b/docs/labs/spirent.rst
@@ -1,10 +1,11 @@
  Spirent Virtual Cloud Test Lab
  ===============================
  
-A community provided metal resource hosted at Nephoscale, leveraged for SDN/NFV public testing and OpenDaylight,
-OpenStack, OPNFV projects.
+A community provided metal resource hosted at Nephoscale, leveraged for SDN/NFV public testing and
+OpenDaylight, OpenStack, OPNFV projects.
  
-**Spirent VCT Lab** is currently working on 3 different **OpenStack** environments each one of them deployed on different hardware configuration:
+**Spirent VCT Lab** is currently working on 3 different **OpenStack** environments each one of them
+deployed on different hardware configuration:
  
    * **OpenStack Juno - 2014.2.2 release** (CentOS 7, 20 Cores, 64 GB RAM, 1 TB SATA, 40 Gbps)
    * **OpenStack Juno - 2014.2.2 release** (Ubuntu 14.04, 8 cores, 32 GB RAM, 500 GB SATA, 10 Gbps)
@@ -20,20 +21,24 @@ There are a number of different networks referenced in the VPTC Design Blueprint
    * Mission Clients – 10g
    * Mission Servers – 10g
  
-These can be added or removed as specified by the test methodology.
-There are 8 x 10 gige SFP+ ports available on a typical C100MP used for Avalanche Layer 4-7 testing.
-The N4U offers 2 x 40 gige QSFP+ ports with the MX-2 Spirent Test Center Layer 2-3 testing.
-There are 2 x Cumulus switches with 32 ports of 40 gige QSFP+ ports for a total capacity of 256 ports of 10
-gige. We use QSFP+ to SFP+ break out cables to convert a single 40 gige port into 4 x 10 gige ports.
-Together these offer a flexible solution to allow up to 8 simultaneous tests to take place with physical
-traffic generators at the same time.  Assuming a 10 to 1 oversubscription ratio we could handle 80 community
-users with the current environment.
+These can be added or removed as specified by the test methodology.  There are 8 x 10 gige SFP+
+ports available on a typical C100MP used for Avalanche Layer 4-7 testing.  The N4U offers 2 x 40
+gige QSFP+ ports with the MX-2 Spirent Test Center Layer 2-3 testing.  There are 2 x Cumulus
+switches with 32 ports of 40 gige QSFP+ ports for a total capacity of 256 ports of 10 gige. We use
+QSFP+ to SFP+ break out cables to convert a single 40 gige port into 4 x 10 gige ports.  Together
+these offer a flexible solution to allow up to 8 simultaneous tests to take place with physical
+traffic generators at the same time.  Assuming a 10 to 1 oversubscription ratio we could handle 80
+community users with the current environment.
  
  For example:
  
    * An 80 Gbps test would need 4 port pairs of 10 gige each and require 8 mission networks.
-  * Multiple clients sharing common test hardware might have dedicated management networks for their DUTs yet communicate with the APIs and Management services via a shared DMZ network protected by a firewall.
-  * SSL and IPSec VPN will typically be leveraged to connect networks across the untrusted Internet or other third party networks.
-  * Stand-alone DUT servers using STCv and AVv traffic generators could easily scale to hundreds of servers as needed.
+  * Multiple clients sharing common test hardware might have dedicated management networks for their
+    DUTs yet communicate with the APIs and Management services via a shared DMZ network protected by
+    a firewall.
+  * SSL and IPSec VPN will typically be leveraged to connect networks across the
+    untrusted Internet or other third party networks.
+  * Stand-alone DUT servers using STCv and AVv traffic generators could easily scale to hundreds of
+    servers as needed.
  
  .. image:: images/spirent_vptc-public-drawing.png
diff --git a/docs/platformoverview/labinfrastructure.rst b/docs/platformoverview/labinfrastructure.rst

index d189240..09c253d 100644 (file)
--- a/docs/platformoverview/labinfrastructure.rst
+++ b/docs/platformoverview/labinfrastructure.rst
@@ -8,13 +8,14 @@
  OPNFV Lab Infrastructure
  ************************
  
-The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ provides a lab infrastructure that is geographically
-and technically diverse. Labs instantiate **bare-metal** and **virtual** environments that are accessed remotely by the
-community and used for OPNFV platform and feature development, builds, deploys and testing. This will greatly assist
-in developing a highly robust and stable OPNFV platform with well understood performance characteristics. Community
-labs are hosted by OPNFV member companies on a voluntary basis. The Linux Foundation also hosts an OPNFV lab that
+The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ provides a lab infrastructure that
+is geographically and technically diverse. Labs instantiate **bare-metal** and **virtual**
+environments that are accessed remotely by the community and used for OPNFV platform and feature
+development, builds, deploys and testing. This will greatly assist in developing a highly robust and
+stable OPNFV platform with well understood performance characteristics. Community labs are hosted by
+OPNFV member companies on a voluntary basis. The Linux Foundation also hosts an OPNFV lab that
  provides centralised CI and other production resources which are linked to community labs.
  
-Future lab capabilities will include the ability easily automate deploy and test of any OPNFV install scenario in any
-lab environemnt as well as a *Virtual Lab* for developer on-boarding with minimal effort. :ref:`pharos_master` documents
-are included with this release.
+Future lab capabilities will include the ability easily automate deploy and test of any OPNFV
+install scenario in any lab environemnt as well as a *Virtual Lab* for developer on-boarding with
+minimal effort. :ref:`pharos_master` documents are included with this release.
diff --git a/docs/specification/hardwarespec.rst b/docs/specification/hardwarespec.rst

index a66e68f..28165eb 100644 (file)
--- a/docs/specification/hardwarespec.rst
+++ b/docs/specification/hardwarespec.rst
@@ -9,8 +9,10 @@ Hardware
  A pharos compliant OPNFV test-bed provides:
  
  - One CentOS 7 jump server on which the virtualized Openstack/OPNFV installer runs
-- In the Brahmaputra release you may select a variety of deployment toolchains to deploy from the jump server.
-- 5 compute / controller nodes (`BGS <https://wiki.opnfv.org/get_started/get_started_work_environment>`_ requires 5 nodes)
+- In the Brahmaputra release you may select a variety of deployment toolchains to deploy from the
+  jump server.
+- 5 compute / controller nodes (`BGS
+  <https://wiki.opnfv.org/get_started/get_started_work_environment>`_ requires 5 nodes)
  - A configured network topology allowing for LOM, Admin, Public, Private, and Storage Networks
  - Remote access as defined by the Jenkins slave configuration guide
  
diff --git a/docs/specification/networkconfig.rst b/docs/specification/networkconfig.rst

index 94477fc..fa95faa 100644 (file)
--- a/docs/specification/networkconfig.rst
+++ b/docs/specification/networkconfig.rst
@@ -9,9 +9,12 @@ Networking
  **Network Hardware**
  
    * 24 or 48 Port TOR Switch
-  * NICs - Combination of 1GE and 10GE based on network topology options (per server can be on-board or use PCI-e)
-  * Connectivity for each data/control network is through a separate NIC. This simplifies Switch Management however requires more NICs on the server and also more switch ports
-  * BMC (Baseboard Management Controller) for lights-out mangement network using IPMI (Intelligent Platform Management Interface)
+  * NICs - Combination of 1GE and 10GE based on network topology options (per server can be on-board
+    or use PCI-e)
+  * Connectivity for each data/control network is through a separate NIC. This
+    simplifies Switch Management however requires more NICs on the server and also more switch ports
+  * BMC (Baseboard Management Controller) for lights-out mangement network using IPMI (Intelligent
+    Platform Management Interface)
  
  **Network Options**
  
@@ -31,7 +34,8 @@ Networking
    * Option III: 2x1G Control, 2x10G Data, 2x10G Storage, 24 Port Switch
  
      * Data NIC used for VNF traffic
-    * Storage NIC used for control plane and Storage segmented through VLANs (separate host traffic from VNF)
+    * Storage NIC used for control plane and Storage segmented through VLANs (separate host traffic
+      from VNF)
      * 1 x 1G for lights-out mangement
      * 1 x 1G for Admin/PXE boot
      * 2 x 10G for control-plane connectivity/storage
diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst

index f6cfabe..0a0ad6a 100644 (file)
--- a/docs/specification/objectives.rst
+++ b/docs/specification/objectives.rst
@@ -6,20 +6,23 @@
  Pharos Compliance
  -----------------
  
-The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
-platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
-management/usage policies and process;  and a support plan for reliable access to project and release resources.
-Community labs are provided as a service by companies and are not controlled by Pharos however our objective is
-to provide easy visibility of all lab capabilities and their usage at all-times.
+The **Pharos Specification** defines a hardware environment for deployment and testing of the
+**Brahmaputra** platform release. The **Pharos Project** is also responsible for defining lab
+capabilities, developing management/usage policies and process;  and a support plan for reliable
+access to project and release resources.  Community labs are provided as a service by companies and
+are not controlled by Pharos however our objective is to provide easy visibility of all lab
+capabilities and their usage at all-times.
  
  Pharos lab infrastructure has the following objectives:
  - Provides secure, scalable, standard and HA environments for feature development
  - Supports the full Brahmaputra deployment lifecycle (this requires a **bare-metal** environment)
  - Supports functional and performance testing of the Brahmaputra release
-- Provides mechanisms and procedures for secure remote access to Pharos compliant environments for OPNFV community
+- Provides mechanisms and procedures for secure remote access to Pharos compliant environments for
+  OPNFV community
  
-Deploying Brahmaputra in a Virtualized environment is possible and will be useful, however it does not provide a fully
-featured deployment and realistic test environment for the Brahmaputra release of OPNFV.
+Deploying Brahmaputra in a Virtualized environment is possible and will be useful, however it does
+not provide a fully featured deployment and realistic test environment for the Brahmaputra release
+of OPNFV.
  
  The high level architecture is outlined in the following diagram:
  
diff --git a/docs/specification/remoteaccess.rst b/docs/specification/remoteaccess.rst

index 185eaa8..4b8160b 100644 (file)
--- a/docs/specification/remoteaccess.rst
+++ b/docs/specification/remoteaccess.rst
@@ -9,11 +9,12 @@ Remote Management
  Remote access is required for …
  
    * Developers to access deploy/test environments (credentials to be issued per POD / user)
-  * Connection of each environment to Jenkins master hosted by Linux Foundation for automated deployment and test
+  * Connection of each environment to Jenkins master hosted by Linux Foundation for automated
+    deployment and test
  
-OpenVPN is generally used for remote however community hosted labs may vary due to company security rules. For POD
-access rules / restrictions refer to individual lab documentation as each company may have different access rules
-and acceptable usage policies.
+OpenVPN is generally used for remote however community hosted labs may vary due to company security
+rules. For POD access rules / restrictions refer to individual lab documentation as each company may
+have different access rules and acceptable usage policies.
  
  Basic requirements:
  
@@ -31,15 +32,19 @@ Lights-out management network requirements:
    * Access to server is through a lights-out-management tool and/or a serial console
    * Refer to applicable light-out mangement information from server manufacturer, such as ...
  
-    * Intel lights-out `RMM <http://www.intel.com/content/www/us/en/server-management/intel-remote-management-module.html>`_
+    * Intel lights-out
+      `RMM <http://www.intel.com/content/www/us/en/server-management/intel-remote-management-module.html>`_
      * HP lights-out `ILO <http://www8.hp.com/us/en/products/servers/ilo/index.html>`_
      * CISCO lights-out `UCS <https://developer.cisco.com/site/ucs-dev-center/index.gsp>`_
  
  Linux Foundation Lab is a UCS-M hardware environment with controlled access *as needed*
  
-    * `Access rules and procedure <https://wiki.opnfv.org/display/pharos/Lflab+Hosting>`_ are maintained on the Wiki
-    * `A list of people <https://wiki.opnfv.org/display/pharos/Lf+Support>`_ with access is maintained on the Wiki
-    * Send access requests to infra-steering@lists.opnfv.org with the following information ...
+    * `Access rules and procedure <https://wiki.opnfv.org/display/pharos/Lflab+Hosting>`_ are
+      maintained on the Wiki
+    * `A list of people <https://wiki.opnfv.org/display/pharos/Lf+Support>`_ with access is
+      maintained on the Wiki
+    * Send access requests to infra-steering@lists.opnfv.org with the
+      following information ...
  
        * Name:
        * Company:
@@ -50,6 +55,9 @@ Linux Foundation Lab is a UCS-M hardware environment with controlled access *as
        * What specific POD/machines will be accessed:
        * What support is needed from LF admins and LF community support team:
  
-    * Once access is approved please follow instructions for setting up VPN access
+    * Once access is approved please follow instructions for setting up VPN access ...
+      https://wiki.opnfv.org/get_started/lflab_hosting
      * The people who require VPN access must have a valid PGP key bearing a valid signature from LF
-    * When issuing OpenVPN credentials, LF will be sending TLS certificates and 2-factor authentication tokens, encrypted to each recipient's PGP key
+    * When issuing OpenVPN credentials, LF will be sending TLS certificates and 2-factor
+      authentication tokens, encrypted to each recipient's PGP key
+
author	10013968 <zhang.jun3g@zte.com.cn>
	Mon, 18 Jul 2016 15:51:00 +0000 (23:51 +0800)
committer	10013968 <zhang.jun3g@zte.com.cn>
	Wed, 27 Jul 2016 15:49:59 +0000 (23:49 +0800)
docs/configguide/lab_update_guide.rst		patch \| blob \| history
docs/configguide/pharosconfig.rst		patch \| blob \| history
docs/how-to-use-docs/documentation-example.rst		patch \| blob \| history
docs/information/pharos.rst		patch \| blob \| history
docs/lab-description/inventory.rst		patch \| blob \| history
docs/lab-description/pod_description.rst		patch \| blob \| history
docs/lab-description/templates.rst		patch \| blob \| history
docs/labs/Dell.rst		patch \| blob \| history
docs/labs/OOL.rst		patch \| blob \| history
docs/labs/ZTE.rst		patch \| blob \| history
docs/labs/huawei-us-lab/huawei-us-lab.rst		patch \| blob \| history
docs/labs/orange_paris_lab_description.rst		patch \| blob \| history
docs/labs/orange_paris_pod1_description.rst		patch \| blob \| history
docs/labs/spirent.rst		patch \| blob \| history
docs/platformoverview/labinfrastructure.rst		patch \| blob \| history
docs/specification/hardwarespec.rst		patch \| blob \| history
docs/specification/networkconfig.rst		patch \| blob \| history
docs/specification/objectives.rst		patch \| blob \| history
docs/specification/remoteaccess.rst		patch \| blob \| history