summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-01-29 17:14:10 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-01-29 17:14:10 -0800
commit2a0aa0850096c68372a2630be4b0655dd3c924d1 (patch)
treee32a9b1db02ff4eea510d0d66d83f5b45fc3f4ae /docs
parentf4b988590935212c3cba95351f004cc0d47de29b (diff)
Cleaned up docs for toolchain errors.
Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/configguide/lab_update_guide.rst2
-rw-r--r--docs/information/pharos.rst164
-rw-r--r--docs/specification/jumpserverinstall.rst6
-rw-r--r--docs/specification/objectives.rst21
4 files changed, 95 insertions, 98 deletions
diff --git a/docs/configguide/lab_update_guide.rst b/docs/configguide/lab_update_guide.rst
index ca79ed5..8abab9f 100644
--- a/docs/configguide/lab_update_guide.rst
+++ b/docs/configguide/lab_update_guide.rst
@@ -1,13 +1,13 @@
How to update the lab info on this wiki
========================================
+
Details about Hosted Community OPNFV Test Labs are located in 3 different places:
- Summarized on the OPNFV wiki [[start#opnfv_community_labs|Start Page]]
- Overview with additional details on the [[pharos#opnfv_test_labs|Pharos Test Bed Governance Project Page]]
- With Project specific information on each project page
-----
How to update the Start Page
-----------------------------
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst
index bf5c060..f65d215 100644
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -1,86 +1,101 @@
-Project: Testbed infrastructure (Pharos)
-#########################################
+Pharos Project: OPNFV Lab Infrastructure
+########################################
+The **Pharos Project** 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.
-The Pharos project deals with the creation of a distributed and federated NFV test capability that will be hosted
-by a number of companies in the OPNFV community. The goals consist in managing the list of community platforms,
-describing the different community platforms, offering timeslots and tools to perform tests, sharing the results
-and the best practices, supporting any test campaigns of the projects of the community (e.g.
-[[opnfv_functional_testing | functional testing project]], [[platform_performance_benchmarking|Qtip]],
-[[get_started|BGS]], [[oscar/project_proposal|oscar]],...). Pharos shall provide the infrastructure and the tooling
-needed by the different projects.
+Communication
+-------------
+
+- Jira <https://jira.opnfv.org/projects/PHAROS/summary>
+- Weekly Pharos meeting logistics <https://wiki.opnfv.org/meetings#pharos_meetings>
+- Weekly Test Coordination meeting logistics <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
+
+**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>
+
+**Pharos Milesone Planning** <https://wiki.opnfv.org/pharos_rls_b_plan>
-.. image:: ../images/opnfv-test.jpg
Community Test Labs
--------------------
-A summary of all Community Hosted OPNFV test labs (existing and planned) is also kept on the `wiki home page
-<https://wiki.opnfv.org/start#opnfv_community_labs>`. This section here contains additional details and project
-relationship mappings. //NOTE: Please follow `these instructions <https://wiki.opnfv.org/lab_update_guide>` when
-updating this list.//
-
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| Map | Hosting | Home page | Contact person | Comments | Location |
-| Position | Organization | | | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 1 | Spirent | https://wiki.opnfv.org/pharos/spirentvctlab | Iben Rodriguez | OpenDaylight, NFV, SDN, & | Nephoscale |
-| | | | iben.rodriguez@spirent.com | OpenStack testing in progress | San Jose, CA |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 2 | China Mobile | | Fu Qiao | PODs dedicated for BGS and | Beijing, China |
-| | | | fuqiao@chinamobile.com | Functest | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 3 | Ericsson | https://wiki.opnfv.org/get_started/ericsson_hosting | Jonas Bjurel | | Montreal, Canada |
-| | | | jonas.bjurel@ericsson.com | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 4 | Huawei | | Radoaca Vasile | TBD | Xi an, China |
-| | | | radoaca.vasile@huawei.com | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 5 | Intel | https://wiki.opnfv.org/get_started/intel_hosting | Trevor Cooper | Operational with PODs dedicated to | Intel Labs; Hillsboro|
-| | | | trevor.cooper@intel.com | BGS and vSwitch projects | Oregon |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 6 | Orange | | Morgan Richomme | Available Q1 2015 | Orange Labs; |
-| | | | morgan.richomme@orange.com | | Lannion, France |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 7 | Cable Labs | | | TBD | |
-| | | | | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 8 | Dell | https://wiki.opnfv.org/dell_hosting | Wenjing Chu | Operational with 3 PODs | Santa Clara, CA |
-| | | | Wenjing_Chu@DELL.com | outputs | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 9 | Huawei | | Sean Chen | TBD | Santa Clara, CA |
-| | | | | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-| 10 | ZTE | | Zhihui Wu | BGS Parser Yardstick | Nanjing, China |
-| | | | wu.zhihui1@zte.com.cn | | |
-+-----------+---------------+------------------------------------------------------+---------------------------------------------+-------------------------------------+----------------------+
-
-
-
-Pharos management
-------------------
-
-- `Project proposal <https://wiki.opnfv.org/opnfv_testbed_infrastructure>`_
-- A "Pharos compliant" environment is the `standard configuration of a deployed system <https://wiki.opnfv.org/pharos/pharos_specification>`_ for test purposes
-- `Testing <https://wiki.opnfv.org/pharos_testing>`_ on "Pharos compliant" environment
-- `Project draft release <https://wiki.opnfv.org/pharos_draft_release>`_
-- `Task follow-up <https://wiki.opnfv.org/pharos_tasks>`_
-- `FAQ <https://wiki.opnfv.org/pharos_faq>`_
-- `meeting & minutes page] <https://wiki.opnfv.org/wiki/test_and_performance_meetings>`_ <- this page needs to be moved and renamed
-
-Pharos project - Key facts
----------------------------
-
+A map of OPNFV lab locations, lab owners and other individual lab information is maintained on the **Wiki**
+<https://wiki.opnfv.org/start#opnfv_community_labs>
+
++----+---------------+----------------------------------------------------------+----------------------+
+| | Hosting | Home page | Location |
+| # | Organization | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 1 | Linux | https://wiki.opnfv.org/get_started/lflab_hosting | Portland, Oregon |
+| | Foundation | | |
++--- +---------------+----------------------------------------------------------+----------------------+
+| 2 | Cable Labs | Internal use only at present | Denver, Colorado |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 3 | Spirent | https://wiki.opnfv.org/pharos/spirentvctlab | Nephoscale |
+| | | | San Jose, CA |
++----+---------------+----------------------------------------------------------+----------------------+
+| 4 | China Mobile | https://wiki.opnfv.org/lab2_chinamobile_hosting | Beijing, China |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 5 | Dell | https://wiki.opnfv.org/dell_hosting | Santa Clara, CA |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 6 | Enea | https://wiki.opnfv.org/enea-pharos-lab | Kista, Sweden |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 7 | Ericsson | https://wiki.opnfv.org/get_started/ericsson_hosting | Montreal, Canada |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 8 | Huawei | https://wiki.opnfv.org/lab4_huawei | Xi an, China |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 9 | Huawei | https://wiki.opnfv.org/get_started/huawei_sc_hosting | Santa Clara, CA |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 10 | Intel | https://wiki.opnfv.org/get_started/intel_hosting | Hillsboro, Oregon |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 11 | Orange | https://wiki.opnfv.org/opnfv-orange | Lannion, France |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 12 | Orange | https://wiki.opnfv.org/opnfv-orange | Paris, France |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+| 13 | ZTE | https://wiki.opnfv.org/zte-nj-testlab | Nan Jing, China |
+| | | | |
++----+---------------+----------------------------------------------------------+----------------------+
+
+
+Pharos project - Key Facts
+--------------------------
+
+- Project: Testbed infrastructure (Pharos)
- Project Creation Date: January 8, 2015
- Project Category: Integration & Testing
-- Lifecycle State: Incubation
+- Lifecycle State: Mature
- Primary Contact: Trevor <trevor.cooper@intel.com>
- Project Lead: Trevor <trevor.cooper@intel.com>
- Jira Project Name: Testbed infrastructure Project
- Jira Project Prefix: PHAROS
-- Committers:
+- Mailing list tag: [pharos]
+- IRC: Server:freenode.net Channel:#opnfv-pharos
+- Repository: pharos
+- Committers:
- Trevor Cooper<trevor.cooper@intel.com>
- Fu Qiao <fuqiao@chinamobile.com>
- Sheng-ann Yu <sheng-ann.yu@ericsson.com>
@@ -93,16 +108,3 @@ Pharos project - Key facts
- Sean Chen <s.chen@huawei.com>
- Saikrishna M Kotha <saikrishna.kotha@xilinx.com>
- Eugene Yu <yuyijun@huawei.com>
-
-- Contributors:
-
- - Iben Rodriguez <iben.rodriguez@spirent.com>
-
-
-- IRC : freenode.net #opnfv-pharos `http://webchat.freenode.net/?channels=opnfv-pharos <http://webchat.freenode.net/?channels=opnfv-pharos>`_
-- Mailing List : no dedicated mailing list - use opnfv-tech-discuss and tag your emails with [Pharos] in the subject for easier filtering
-- Meetings :
-
- - `meetings <https://wiki.opnfv.org/wiki/test_and_performance_meetings>`_
-
-- Repository: pharos
diff --git a/docs/specification/jumpserverinstall.rst b/docs/specification/jumpserverinstall.rst
index a82c335..7b10578 100644
--- a/docs/specification/jumpserverinstall.rst
+++ b/docs/specification/jumpserverinstall.rst
@@ -1,7 +1,5 @@
**Jump Server Configuration:**
-(Rough Placeholder, edit me)
-
**Fuel**
1. Obtain CentOS 7 Minimal ISO and install
@@ -77,7 +75,3 @@
17. Connect to the console of the installing VM with your favorite VNC client.
18. Change the IP settings to match the pod, use an IP in the PXE/Admin network for the Fuel Master
-
-**Foreman**
-
-TBA
diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst
index 5342388..efa69ed 100644
--- a/docs/specification/objectives.rst
+++ b/docs/specification/objectives.rst
@@ -1,19 +1,20 @@
Objectives / Scope
-------------------
-The Pharos specification defines the OPNFV hardware environment
-upon which the OPNFV Brahmaputra platform release can be deployed
-on and tested. This specification defines:
+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.
-- A secure, scalable, standard and HA environment
-- Supports the full Brahmaputra deployment lifecycle (this requires a bare metal environment)
+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 the test environment
+- 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 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: