summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/configguide/configguide.rst2
-rw-r--r--docs/configguide/jumpserverinstall.rst27
-rw-r--r--docs/configguide/lab_update_guide.rst18
-rw-r--r--docs/information/pharos.rst105
-rw-r--r--docs/labs/OOL.rst190
-rw-r--r--docs/labs/images/ool-testlab.pngbin0 -> 763367 bytes
-rw-r--r--docs/labs/images/orange_paris_pod1.jpgbin0 -> 353262 bytes
-rw-r--r--docs/labs/orange_paris_lab_description.rst73
-rw-r--r--docs/labs/orange_paris_pod1_description.rst127
-rw-r--r--docs/labs/zte-nj-lab/lab_description.rst67
-rw-r--r--docs/specification/remoteaccess.rst6
11 files changed, 549 insertions, 66 deletions
diff --git a/docs/configguide/configguide.rst b/docs/configguide/configguide.rst
index 3f1c035..2946677 100644
--- a/docs/configguide/configguide.rst
+++ b/docs/configguide/configguide.rst
@@ -20,7 +20,7 @@ When setting up an OPNFV community lab ...
* Update the Pharos Wiki with lab details
* Lab map, organization, contacts, status, location, resources, role, etc.
- * https://wiki.opnfv.org/pharos#community_labs
+ * `Community labs <https://wiki.opnfv.org/display/pharos#PharosHome-Overview>`_
* :ref:`pharos_wiki`
* Update the Pharos project information file "Current Labs"
diff --git a/docs/configguide/jumpserverinstall.rst b/docs/configguide/jumpserverinstall.rst
index 19a659a..e51e946 100644
--- a/docs/configguide/jumpserverinstall.rst
+++ b/docs/configguide/jumpserverinstall.rst
@@ -28,9 +28,9 @@ may be outdated (please refer to Fuel Installer documents).
``service network restart``
-6. Edit /etc/resolv.conf and add a nameserver
+6. Edit /etc/resolv.conf and add a nameserver, for example 8.8.8.8
- ``vi /etc/resolv.conf``
+ ``echo nameserver 8.8.8.8 >> /etc/resolv.conf``
7. Install libvirt & kvm
@@ -42,13 +42,26 @@ may be outdated (please refer to Fuel Installer documents).
``shutdown -r now``
-9. If you wish to avoid annoying delay when use ssh to log in, disable DNS lookups:
+9. Configure SSHD
- ``vi /etc/ssh/sshd_config``
+ If you wish to avoid annoying delay when use ssh to log in, disable DNS lookups:
- Uncomment "UseDNS yes", change 'yes' to 'no'.
+ When **UseDNS** is existed in the config file, update it:
- Save
+ ``sed -i -e 's/^#*UseDNS\ \+yes/UseDNS no/' /etc/ssh/sshd_config``
+
+ or append the setting when not existed:
+
+ ``echo UseDNS no >> /etc/ssh/ssd_config``
+
+ Disable Password Authenticaion for security:
+
+ ``sed -i -e 's/^#PasswordAuthentication\ \+yes/PasswordAuthentication no/' /etc/ssh/sshd_config``
+
+ If you want to disable IPv6 connections, comment IPv6 ListenAddress and change AddressFamily to inet:
+
+ ``sed -i -e 's/^ListenAddress\ \+::/#ListenAddress ::/' /etc/ssh/sshd_config``
+ ``sed -i -e 's/^AddressFamily\ \+any/AddressFamily inet/' /etc/ssh/sshd_config``
10. Restart sshd
@@ -62,6 +75,8 @@ may be outdated (please refer to Fuel Installer documents).
13. Create a bridge using the interface on the PXE network, for example: br0
+ ``brctl addbr br0``
+
14. Make a directory owned by qemu:
``mkdir /home/qemu; mkdir -p /home/qemu/VMs/fuel-6.0/disk``
diff --git a/docs/configguide/lab_update_guide.rst b/docs/configguide/lab_update_guide.rst
index 3f90d5c..98aec63 100644
--- a/docs/configguide/lab_update_guide.rst
+++ b/docs/configguide/lab_update_guide.rst
@@ -11,8 +11,10 @@ Updating Pharos Documents
Details about each Community Lab is found in 3 places:
- - Summary of lab including location, contacts, status, etc. on the `Pharos Project Wiki page <https://wiki.opnfv.org/pharos>`_
- - Lab specific details are provided with dedicated Wiki pages, see this `Example Lab <https://wiki.opnfv.org/get_started/intel_hosting>`_
+ - Summary of lab including location, contacts, status, etc.
+ on the `Pharos Project Wiki page <https://wiki.opnfv.org/display/pharos>`_
+ - Lab specific details are provided with dedicated Wiki pages,
+ see this `Example Lab <https://wiki.opnfv.org/display/pharos/Intel+Hosting>`_
- Pharos repo docs ...
- docs/information/pharos.rst ... project information file
@@ -35,18 +37,22 @@ 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
* .8 <- for size
- * marker color png ([[marker-green.png|marker-green.png]], [[marker-blue.png|marker-blue.png]], [[marker-red.png|marker-red.png]], [[marker-gold.png|marker-gold.png]])
+ * marker color png ([[marker-green.png|marker-green.png]], [[marker-blue.png|marker-blue.png]],
+ [[marker-red.png|marker-red.png]], [[marker-gold.png|marker-gold.png]])
* Nice Format Lab Name
* '';''
* Location Summary
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst
index c55dd4e..87739dd 100644
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -13,7 +13,8 @@ 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.
+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
@@ -31,15 +32,15 @@ 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/pharos
-* `Pharos Planning <https://wiki.opnfv.org/pharos_rls_b_plan>`_
+* `Pharos page <https://www.opnfv.org/developers/pharos>`_
+* `Pharos project Wiki <https://wiki.opnfv.org/display/pharos>`_
+* `Pharos Planning <https://wiki.opnfv.org/display/pharos/Pharos+Colorado+Plan>`_
Project Communication
---------------------
* `Jira <https://jira.opnfv.org/projects/PHAROS/summary>`_
-* `Weekly Pharos meeting <https://wiki.opnfv.org/meetings#pharos_meetings>`_
+* `Weekly Pharos meeting <https://wiki.opnfv.org/display/INF/Infra+Working+Group>`_
* `Weekly coordination meeting for Test related projects <https://wiki.opnfv.org/meetings/test>`_
* IRC: freenode.net #opnfv-pharos http://webchat.freenode.net/?channels=opnfv-pharos
* Mailing List: use opnfv-tech-discuss and tag your emails with [Pharos] in the subject for filtering
@@ -54,9 +55,9 @@ Project Release Artifacts
Pharos Lab Process
------------------
-* Process for requesting lab access and support https://wiki.opnfv.org/pharos_rls_b_support
-* Pharos Lab Governance and Policies https://wiki.opnfv.org/pharos_policies
-* Status of Community labs https://wiki.opnfv.org/pharos_rls_b_labs
+* Process for requesting lab access and support https://wiki.opnfv.org/display/pharos/Pharos+Rls+B+Support
+* Pharos Lab Governance and Policies https://wiki.opnfv.org/display/pharos/Pharos+Policies
+* Status of Community labs https://wiki.opnfv.org/display/pharos/#PharosHome-Overview
Current Labs
------------
@@ -64,46 +65,50 @@ 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>`_
-+----+---------------+----------------------------------------------------------+----------------------+
-| | **Hosted by** | **Home page** | **Location** |
-| # | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 1 | Linux | https://wiki.opnfv.org/get_started/lflab_hosting | Portland, Oregon |
-| | Foundation | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 2 | Spirent | https://wiki.opnfv.org/pharos/spirentvctlab | Nephoscale, CA |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 3 | China Mobile | https://wiki.opnfv.org/lab2_chinamobile_hosting | Beijing, China |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 4 | Dell | https://wiki.opnfv.org/dell_hosting | Santa Clara, CA |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 5 | Enea | https://wiki.opnfv.org/enea-pharos-lab | Kista, Sweden |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 6 | Ericsson | https://wiki.opnfv.org/get_started/ericsson_hosting | Montreal, Canada |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 7 | Huawei | https://wiki.opnfv.org/lab4_huawei | Xi an, China |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 8 | Huawei | https://wiki.opnfv.org/get_started/huawei_sc_hosting | Santa Clara, CA |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 9 | Intel | https://wiki.opnfv.org/get_started/intel_hosting | Hillsboro, Oregon |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 10 | Orange | https://wiki.opnfv.org/opnfv-orange | Lannion, France |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 11 | Orange | https://wiki.opnfv.org/opnfv-orange | Paris, France |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 12 | ZTE | https://wiki.opnfv.org/zte-nj-testlab | Nan Jing, China |
-| | | | |
-+----+---------------+----------------------------------------------------------+----------------------+
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| # | **Hosted by** | **Home page** | **Location** |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 1 | Linux | https://wiki.opnfv.org/display/pharos/Lflab+Hosting | Portland, Oregon |
+| | Foundation | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 2 | Spirent | https://wiki.opnfv.org/display/pharos/Spirentvctlab | Nephoscale, CA |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 3 | China Mobile | https://wiki.opnfv.org/display/pharos/Lab2+Chinamobile+Hosting | Beijing, China |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 4 | Dell | https://wiki.opnfv.org/display/pharos/Dell+Hosting | Santa Clara, CA |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 5 | Enea | https://wiki.opnfv.org/display/pharos/Enea-pharos-lab | Kista, Sweden |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 6 | Ericsson | https://wiki.opnfv.org/display/pharos/Ericsson+Hosting+and+Request+Process | Montreal, Canada |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 7 | Huawei | https://wiki.opnfv.org/display/pharos/Lab4+Huawei | Xi an, China |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 8 | Huawei | https://wiki.opnfv.org/display/pharos/Huawei+Sc+Hosting | Santa Clara, CA |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 9 | Intel | https://wiki.opnfv.org/display/pharos/Intel+Hosting | Hillsboro, Oregon |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 10 | Orange | https://wiki.opnfv.org/display/pharos/Opnfv-orange | Lannion, France |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 11 | Orange | https://wiki.opnfv.org/display/pharos/Opnfv-orange | Paris, France |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 12 | ZTE | https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab | Nan Jing, China |
+| | | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 13 | Okinawa | https://wiki.opnfv.org/display/pharos/OOL+TestLab | Okinawa |
+| | Open Lab | | |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+
Pharos project Key Facts
@@ -111,5 +116,5 @@ 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/pharos?&#pharos_project_-_key_facts>`_
- * Project key facts in repo: pharos/INFO
+ * Can be viewed on the project Wiki `INFO <https://wiki.opnfv.org/display/pharos/#PharosHome-KeyProjectFacts>`_
+ * Project key facts in repo: pharos/INFO
diff --git a/docs/labs/OOL.rst b/docs/labs/OOL.rst
new file mode 100644
index 0000000..09cd896
--- /dev/null
+++ b/docs/labs/OOL.rst
@@ -0,0 +1,190 @@
+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".
+
+
+Environment
+------------------
+The test lab POD is setup along the Pharos project guidelines.
+Servers are deployed in the the following configuration.
+
+* 1 Jump server
+* 3 Controller node
+* 2 compute node
+
+**Hardware Description**
+
+* 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 |
++------------------------------------------------------------+---------------------------------------------+
+
+* 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 |
++----------------------------------------------+---------------------------+-----+
+
+---
+
+**Network**
+
+* Network Overview
+
+.. image:: images/ool-testlab.png
+
+
+
+* Server Nic
+
+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 |
++------------------+--------------------------------------------+----------+-------------------------------+---------+-----------------------------+
+
+* 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 |
++------------------------+--------------------+-----------------------+----------------------+-------------+
+
+---
+
+
+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
+
+subject: opnfv_access_ool
+
+Following information should be provided in the request:
+
+* Full name
+* e-mail
+* Phone
+* Organization
+* Resources required
+* How long is access needed
+* PGP public key
+* SSH public key
+
+Granting access normally takes 2-3 business days.
+
+Detailed access descriptions will be provided with your access grant e-mail
diff --git a/docs/labs/images/ool-testlab.png b/docs/labs/images/ool-testlab.png
new file mode 100644
index 0000000..d0ac935
--- /dev/null
+++ b/docs/labs/images/ool-testlab.png
Binary files differ
diff --git a/docs/labs/images/orange_paris_pod1.jpg b/docs/labs/images/orange_paris_pod1.jpg
new file mode 100644
index 0000000..8e6427f
--- /dev/null
+++ b/docs/labs/images/orange_paris_pod1.jpg
Binary files differ
diff --git a/docs/labs/orange_paris_lab_description.rst b/docs/labs/orange_paris_lab_description.rst
new file mode 100644
index 0000000..f22d90f
--- /dev/null
+++ b/docs/labs/orange_paris_lab_description.rst
@@ -0,0 +1,73 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+**************************
+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.
+
+The Orange Paris lab consist of 1 POD
+ * POD for Fuel
+
+
+Lab Resources
+-------------
+
++----------------+----------------+----------------+----------------+----------------+----------------+----------------+
+| 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, ...
+* **Status:** Assigned, Configuring, Active, Troubleshooting, Available, ...
+
+
+Acceptable Usage Policy
+-----------------------
+
+Define lab user policies and expectations
+
+
+Remote Access Infrastructure
+----------------------------
+
+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
+ * Organization
+ * Purpose of using the labs
+ * Dates start / end
+
+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.)
+
+
+Lab Documentation
+-----------------
+
+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.
+
+.. 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
new file mode 100644
index 0000000..59dde96
--- /dev/null
+++ b/docs/labs/orange_paris_pod1_description.rst
@@ -0,0 +1,127 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+**************************
+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.
+
+Version: Brahmaputra
+Installer: Fuel (with Ceph)
+
+Additional Requirements
+-----------------------
+
+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 | | | |
+| | | | | | | | | | | |
++--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
+
+**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| | | | | | |
++--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
+
+**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 | | | | |
+| | | | | | | | | | | |
++--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
+
+**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 | | |
++--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
+
+**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 | | |
++--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
+
+Users
+-----
+
++------------------+-----------------------------+--------------+--------------+--------------+
+| Name | Email | Company | Role | Notes |
++------------------+-----------------------------+--------------+--------------+--------------+
+| | | | | |
++------------------+-----------------------------+--------------+--------------+--------------+
+
+Firewall Rules
+--------------
+
++--------------+--------------+--------------+
+| 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.
+
+.. image:: ./images/orange_paris_pod1.jpg
+ :alt: POD diagram not found
diff --git a/docs/labs/zte-nj-lab/lab_description.rst b/docs/labs/zte-nj-lab/lab_description.rst
new file mode 100644
index 0000000..b63148c
--- /dev/null
+++ b/docs/labs/zte-nj-lab/lab_description.rst
@@ -0,0 +1,67 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. _pharos_lab:
+
+**************************
+ZTE NJ Lab Specification
+**************************
+
+Introduction
+------------
+
+ZTE lab currently has one POD available in Nanjing. The POD have 5 hosts, 3 controller+2 computer.
+It focuses on fuel project CI-related activities.
+
+Lab Resources
+-------------
+
++------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
+| POD Name | Project(s) | Project Lead(s) | Email(s) | POD Role | Status | Notes |
++------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
+| POD1 | FUEL | Gregory Elkinbard | gelkinbard@mirantis.com | CI: latest | Active | |
++------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
+
+
+Acceptable Usage Policy
+-----------------------
+
+Resources located in OPNFV ZTE NJ Lab shall only be used for CI, infra setup/configuration and troubleshooting purposes.
+No development work is allowed in OPNFV ZTE Lab.
+
+
+Remote Access Infrastructure
+----------------------------
+
+ZTE lab provide the OpenVPN access for you.
+
+
+Remote Access Procedure
+-----------------------
+
+Access to this environment can be granted by sending an e-mail to:"wu.zhihui1@zte.com.cn"
+
+Subject: opnfv_zte_access.
+
+The following information should be provided in the request:
+
+ Full name:
+ E-mail:
+ Organization:
+ Why is access needed:
+ How long is access needed:
+ What sepcific Host will be accessed:
+ What support is needed from zte admin:
+
+Once access requirment is approved, the instructions for setting up VPN access will be send to you by mail.
+Lab Documentation
+-----------------
+
+../zte.rst
+
+
+Lab Topology
+------------
+
+.. image:: ../images/ZTE_Overview.jpg
diff --git a/docs/specification/remoteaccess.rst b/docs/specification/remoteaccess.rst
index 51950da..185eaa8 100644
--- a/docs/specification/remoteaccess.rst
+++ b/docs/specification/remoteaccess.rst
@@ -37,8 +37,8 @@ Lights-out management network requirements:
Linux Foundation Lab is a UCS-M hardware environment with controlled access *as needed*
- * `Access rules and procedure <https://wiki.opnfv.org/pharos/lf_lab>`_ are maintained on the Wiki
- * `A list of people <https://wiki.opnfv.org/pharos/lf_lab#opnfv_community_members_with_access_to_opnfv_lf_lab>`_ with access is maintained on the Wiki
+ * `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:
@@ -50,6 +50,6 @@ 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 ... https://wiki.opnfv.org/get_started/lflab_hosting
+ * Once access is approved please follow instructions for setting up VPN access
* 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