summaryrefslogtreecommitdiffstats
path: root/docs/labs/ool
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2017-08-17 21:32:10 +0800
committerJulien <zhang.jun3g@zte.com.cn>2017-08-17 21:32:10 +0800
commitaa88673c38be12368dead5e8241fb915d790c431 (patch)
tree38b2de3e04a7d14aa1f9aa73034e36d0c9d3357d /docs/labs/ool
parent34f15a071a9df12986654593193235a21a774fc8 (diff)
restruct documents according to opnfvdocs
Use only development and release for we don't have test codes for now. JIRA: PHAROS-311 Change-Id: Iacfcaba81a7a52e09cf999b8603cc9dc2f8f2b97 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'docs/labs/ool')
-rw-r--r--docs/labs/ool/images/ool-testlab.pngbin763367 -> 0 bytes
-rw-r--r--docs/labs/ool/index.rst18
-rw-r--r--docs/labs/ool/inventory.rst11
-rw-r--r--docs/labs/ool/lab_description.rst72
-rw-r--r--docs/labs/ool/pod1_description.rst185
-rw-r--r--docs/labs/ool/pod1_inventory.yaml38
-rw-r--r--docs/labs/ool/virtual1_description.rst102
7 files changed, 0 insertions, 426 deletions
diff --git a/docs/labs/ool/images/ool-testlab.png b/docs/labs/ool/images/ool-testlab.png
deleted file mode 100644
index d0ac935..0000000
--- a/docs/labs/ool/images/ool-testlab.png
+++ /dev/null
Binary files differ
diff --git a/docs/labs/ool/index.rst b/docs/labs/ool/index.rst
deleted file mode 100644
index 0239e51..0000000
--- a/docs/labs/ool/index.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _pharos-ool:
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-.. Top level of Pharos templates and configuration files
-
-*****************
-OOL OPNFV Testbed
-*****************
-
-.. toctree::
-
- ./lab_description.rst
- ./pod1_description.rst
- ./virtual1_description.rst
- ./inventory.rst
diff --git a/docs/labs/ool/inventory.rst b/docs/labs/ool/inventory.rst
deleted file mode 100644
index 78368c4..0000000
--- a/docs/labs/ool/inventory.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-******************
-OOL Inventory File
-******************
-
-.. code-block:: yaml
-
- import pod1_inventory.yaml
diff --git a/docs/labs/ool/lab_description.rst b/docs/labs/ool/lab_description.rst
deleted file mode 100644
index 72e2bd8..0000000
--- a/docs/labs/ool/lab_description.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-**********************
-Lab: OOL OPNFV Testbed
-**********************
-
-Introduction
-------------
-
-`Okinawa Open Laboratory (OOL)`_ provides the following facilities for OPNFV
-testing. The testlab is now located only at Okinwa in Japan.
-
-.. _Okinawa Open Laboratory (OOL): http://www.okinawaopenlabs.org/en/
-
-Lab Resources
--------------
-
-+--------------+--------------+-----------------+----------------------+-----------+-----------+-------+
-| POD Name | Project(s) | Project Lead(s) | Email(s) | POD Role | Status | Notes |
-+--------------+--------------+-----------------+----------------------+-----------+-----------+-------+
-| `ool-pod1`_ | | | | CI stable | Available | |
-+--------------+--------------+-----------------+----------------------+-----------+-----------+-------+
-| ool-virtual1 | Doctor | Ryota Mibu | r-mibu@cq.jp.nec.com | CI review | Assigned | |
-+--------------+--------------+-----------------+----------------------+-----------+-----------+-------+
-
-.. _ool-pod1: https://build.opnfv.org/ci/computer/ool-pod1/
-
-Acceptable Usage Policy
------------------------
-
-These resources provided to OPNFV are free to use by any OPNFV contributor or
-committer for the purpose of OPNFV approved activities by permission of the
-operator, but shall be used for CI, infra setup/configuration and
-troubleshooting purposes.
-
-Remote Access Infrastructure
-----------------------------
-
-OOL provide VPN(OpenVPN) to connect this testlab.
-
-Remote Access Procedure
------------------------
-
-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.
-
-Lab Documentation
------------------
-
-Lab Topology
-------------
-
-.. image:: images/ool-testlab.png
- :alt: not found
diff --git a/docs/labs/ool/pod1_description.rst b/docs/labs/ool/pod1_description.rst
deleted file mode 100644
index 1640070..0000000
--- a/docs/labs/ool/pod1_description.rst
+++ /dev/null
@@ -1,185 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-*************
-POD: ool-pod1
-*************
-
-Introduction
-------------
-
-This is a physical POD deployed by Fuel installer (Brahmputra).
-
-Additional Requirements
------------------------
-
-.. _ool-pod1-spec:
-
-Server Specifications
----------------------
-
-**Jump Host**
-
-+------------+------------+--------------+---------------+--------------+--------+---------------------+
-| Hostname | Vendor | Model | Serial Number | CPUs | Memory | Storage |
-+============+============+==============+===============+==============+========+=====================+
-| OPNFV-jump | SuperMicro | SYS-5018R-WR | - | E5-2630v3 x1 | 32 GB | SATA 7.2krpm 2TB x1 |
-+------------+------------+--------------+---------------+--------------+--------+---------------------+
-
-+------------+---------------------+--------------------+-------------------+------------+
-| | Lights-out network | 1GbE: NIC#/IP | 10GbE: NIC#/IP | |
-| Hostname | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
-+============+=====================+====================+===================+============+
-| OPNFV-jump | - | IF0: | | NIC Model: |
-| | | 0c:c4:7a:6c:a2:b2 | | Intel I350 |
-| | | VLAN untagged | | |
-| | | Public | | |
-| | | IF1: | | |
-| | | 0c:c4:7a:6c:a2:b3 | | |
-| | | VLAN 10{2-5} | | |
-| | | Admin/Mgmt/Private | | |
-+------------+---------------------+--------------------+-------------------+------------+
-
-**Compute Nodes**
-
-+----------+------------+-----------+---------------+--------------+--------+---------------------+
-| Hostname | Vendor | Model | Serial Number | CPUs | Memory | Storage |
-+==========+============+===========+===============+==============+========+=====================+
-| node-9 | FUJITSU | RX2530 M1 | - | E5-2630v3 x1 | 32 GB | SATA 7.2krpm 2TB x2 |
-| | | | | | | SSD 100GB x1 |
-+----------+------------+-----------+---------------+--------------+--------+---------------------+
-| node-10 | FUJITSU | RX2530 M1 | - | E5-2630v3 x1 | 32 GB | SATA 7.2krpm 2TB x2 |
-| | | | | | | SSD 100GB x1 |
-+----------+------------+-----------+---------------+--------------+--------+---------------------+
-| node-11 | FUJITSU | RX2530 M1 | - | E5-2630v3 x1 | 32 GB | SATA 7.2krpm 2TB x2 |
-| | | | | | | SSD 100GB x1 |
-+----------+------------+-----------+---------------+--------------+--------+---------------------+
-| node-12 | FUJITSU | RX2530 M1 | - | E5-2630v3 x1 | 32 GB | SATA 7.2krpm 2TB x2 |
-| | | | | | | SSD 100GB x1 |
-+----------+------------+-----------+---------------+--------------+--------+---------------------+
-
-+----------+---------------------+-------------------+-------------------+-----------------------+
-| | Lights-out network | 1GbE: NIC#/IP | 10GbE: NIC#/IP | |
-| Hostname | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
-+==========+=====================+===================+===================+=======================+
-| node-9 | - | IF0: | IF4: | NIC Models: |
-| | | 90:1b:0e:6b:e8:a8 | 90:1b:0e:6d:09:71 | (1GbE) Emulex Skyhawk |
-| | | VLAN untagged | VLAN untagged | (10GbE) Intel 82599E |
-| | | Admin | Storage | |
-| | | IF1: | IF5: | |
-| | | 90:1b:0e:6b:e8:a9 | 90:1b:0e:6d:09:72 | |
-| | | VLAN untagged | VLAN untagged | |
-| | | Mgmt | Storage | |
-| | | IF2: | | |
-| | | 90:1b:0e:6b:e8:aa | | |
-| | | VLAN untagged | | |
-| | | Public | | |
-| | | IF3: | | |
-| | | 90:1b:0e:6b:e8:ab | | |
-| | | VLAN untagged | | |
-| | | Private | | |
-+----------+---------------------+-------------------+-------------------+-----------------------+
-| node-10 | - | IF0: | IF4: | NIC Models: |
-| | | 90:1b:0e:6b:e3:00 | 90:1b:0e:6d:09:5f | (1GbE) Emulex Skyhawk |
-| | | VLAN untagged | VLAN untagged | (10GbE) Intel 82599E |
-| | | Admin | Storage | |
-| | | IF1: | IF5: | |
-| | | 90:1b:0e:6b:e3:01 | 90:1b:0e:6d:09:60 | |
-| | | VLAN untagged | VLAN untagged | |
-| | | Mgmt | Storage | |
-| | | IF2: | | |
-| | | 90:1b:0e:6b:e3:02 | | |
-| | | VLAN untagged | | |
-| | | Public | | |
-| | | IF3: | | |
-| | | 90:1b:0e:6b:e3:03 | | |
-| | | VLAN untagged | | |
-| | | Private | | |
-+----------+---------------------+-------------------+-------------------+-----------------------+
-| node-11 | - | IF0: | IF4: | NIC Models: |
-| | | 90:1b:0e:6b:e5:b4 | 90:1b:0e:6d:09:6f | (1GbE) Emulex Skyhawk |
-| | | VLAN untagged | VLAN untagged | (10GbE) Intel 82599E |
-| | | Admin | Storage | |
-| | | IF1: | IF5: | |
-| | | 90:1b:0e:6b:e5:b5 | 90:1b:0e:6d:09:70 | |
-| | | VLAN untagged | VLAN untagged | |
-| | | Mgmt | Storage | |
-| | | IF2: | | |
-| | | 90:1b:0e:6b:e5:b6 | | |
-| | | VLAN untagged | | |
-| | | Public | | |
-| | | IF3: | | |
-| | | 90:1b:0e:6b:e5:b7 | | |
-| | | VLAN untagged | | |
-| | | Private | | |
-+----------+---------------------+-------------------+-------------------+-----------------------+
-| node-12 | - | IF0: | IF4: | NIC Models: |
-| | | 90:1b:0e:6b:e2:bc | 90:1b:0e:6d:08:31 | (1GbE) Emulex Skyhawk |
-| | | VLAN untagged | VLAN untagged | (10GbE) Intel 82599E |
-| | | Admin | Storage | |
-| | | IF1: | IF5: | |
-| | | 90:1b:0e:6b:e2:bd | 90:1b:0e:6d:08:32 | |
-| | | VLAN untagged | VLAN untagged | |
-| | | Mgmt | Storage | |
-| | | IF2: | | |
-| | | 90:1b:0e:6b:e2:be | | |
-| | | VLAN untagged | | |
-| | | Public | | |
-| | | IF3: | | |
-| | | 90:1b:0e:6b:e2:bf | | |
-| | | VLAN untagged | | |
-| | | Private | | |
-+----------+---------------------+-------------------+-------------------+-----------------------+
-
-**Switches**
-
-+--------------------------------------------+--------------------+
-| Node | Hardware |
-+============================================+====================+
-| Switch 1 (for each network except storage) | Juniper EX3300-24T |
-+--------------------------------------------+--------------------+
-| Switch 2 (for storage) | Mellanox SX1024 |
-+--------------------------------------------+--------------------+
-
-**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 |
-+----------------+---------------+---------------+----------------+----------+
-
-VPN Users
----------
-
-+------------+----------------------+---------+--------------+-------+
-| Name | Email | Project | Role | Notes |
-+------------+----------------------+---------+--------------+-------+
-| Ryota Mibu | r-mibu@cq.jp.nec.com | Doctor | Project Lead | |
-+------------+----------------------+---------+--------------+-------+
-
-Firewall Rules
---------------
-
-+------------+------------+-------+
-| Port(s) | Service | Notes |
-+------------+------------+-------+
-| | | |
-+------------+------------+-------+
-
-POD Topology
-------------
-
-.. image:: images/ool-testlab.png
- :alt: not found
diff --git a/docs/labs/ool/pod1_inventory.yaml b/docs/labs/ool/pod1_inventory.yaml
deleted file mode 100644
index 528eb09..0000000
--- a/docs/labs/ool/pod1_inventory.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-nodes:
- - name: node-9
- tags: control
- arch: "x86_64"
- mac_address: "90:1b:0e:6b:e8:a8"
- power:
- type: ipmi
- address: n/a
- user: n/a
- pass: n/a
- - name: node-10
- tags: control
- arch: "x86_64"
- mac_address: "90:1b:0e:6b:e3:00"
- power:
- type: ipmi
- address: n/a
- user: n/a
- pass: n/a
- - name: node-11
- tags: control
- arch: "x86_64"
- mac_address: "90:1b:0e:6b:e5:b4"
- power:
- type: ipmi
- address: n/a
- user: n/a
- pass: n/a
- - name: node-12
- tags: compute
- arch: "x86_64"
- mac_address: "90:1b:0e:6b:e2:bc"
- power:
- type: ipmi
- address: n/a
- user: n/a
- pass: n/a
diff --git a/docs/labs/ool/virtual1_description.rst b/docs/labs/ool/virtual1_description.rst
deleted file mode 100644
index 089bd92..0000000
--- a/docs/labs/ool/virtual1_description.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-*****************
-POD: ool-virtual1
-*****************
-
-Introduction
-------------
-
-This is a virtual POD deployed by Apex installer (master/Colorado).
-This POD is built on one machine placed next to machines of the physical POD
-(ool-pod1). Controller and compute nodes are VM.
-
-Additional Requirements
------------------------
-
-Server Specifications
----------------------
-
-**Jump Host**
-
-See :ref:`ool-pod1-spec`.
-
-**Compute Nodes**
-
-+------------------+--------------+----------------------------+
-| Machine | Hostname | Hardware |
-+==================+==============+============================+
-| Virtual POD | ool-virtual1 | FUJITSU PRIMERGY RX2530 M1 |
-+------------------+--------------+----------------------------+
-
-+------------------------------------+
-| 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 82599E | x2 |
-+------------+------------------+----+
-| BMC | - | x1 |
-+------------+------------------+----+
-
-+--------------+-----+------+-------------------+----------+--------------------+
-| Hostname | IF# | BW | MAC | IF in OS | Role |
-+==============+=====+======+===================+==========+====================+
-| ool-virtual1 | IF0 | 1Gb | 90:1b:0e:6b:e5:d8 | eno1 | Admin |
-+--------------+-----+------+-------------------+----------+--------------------+
-| ool-virtual1 | IF1 | 1Gb | 90:1b:0e:6b:e5:d9 | eno2 | Mgmt |
-+--------------+-----+------+-------------------+----------+--------------------+
-| ool-virtual1 | IF2 | 1Gb | 90:1b:0e:6b:e5:da | eno3 | Public |
-+--------------+-----+------+-------------------+----------+--------------------+
-| ool-virtual1 | IF3 | 1Gb | 90:1b:0e:6b:e5:db | eno4 | Private |
-+--------------+-----+------+-------------------+----------+--------------------+
-| ool-virtual1 | IF4 | 1Gb | 90:1b:0e:6d:08:f5 | ens2f0 | Storage |
-+--------------+-----+------+-------------------+----------+--------------------+
-| ool-virtual1 | IF5 | 1Gb | 90:1b:0e:6d:08:f6 | ens2f1 | Storage |
-+--------------+-----+------+-------------------+----------+--------------------+
-
-**Subnet Allocations in the host**
-
-+--------------+---------------+---------------+----------------+----------+
-| Network name | Address | Mask | Gateway | VLAN id |
-+==============+===============+===============+================+==========+
-| Admin | 192.0.2.0 | 255.255.255.0 | 192.168.103.1 | Untagged |
-+--------------+---------------+---------------+----------------+----------+
-| Public | 192.168.37.0 | 255.255.255.0 | 192.168.105.1 | Untagged |
-+--------------+---------------+---------------+----------------+----------+
-| Private | 11.0.0.0 | 255.255.255.0 | | Untagged |
-+--------------+---------------+---------------+----------------+----------+
-| Storage | 12.0.0.0 | 255.255.255.0 | | Untagged |
-+--------------+---------------+---------------+----------------+----------+
-
-VPN Users
----------
-
-+------------+----------------------+---------+--------------+-------+
-| Name | Email | Project | Role | Notes |
-+------------+----------------------+---------+--------------+-------+
-| Ryota Mibu | r-mibu@cq.jp.nec.com | Doctor | Project Lead | |
-+------------+----------------------+---------+--------------+-------+
-
-Firewall Rules
---------------
-
-+------------+------------+-------+
-| Port(s) | Service | Notes |
-+------------+------------+-------+
-| | | |
-+------------+------------+-------+
-
-POD Topology
-------------
-