summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-02-24 16:18:23 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-02-25 00:30:05 +0000
commit12be78e63f9c6a4270f95288e136371215086103 (patch)
tree46c7339e02a104f65d3939a6128460a82e743c64
parentff9708c9ce539b2d742db00ff2ac6e92e4ee3681 (diff)
Moved section on joining Pharos community out of configguide.rst so that it does not appear in overview docs.stable/brahmaputra
Change-Id: I7114f561cbeae81a2c8e0c67624e22ae0cc54a22 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> (cherry picked from commit 6732859ab09ddb890ad4c67e2834059f57175bd6)
-rw-r--r--docs/configguide/configguide.rst14
-rw-r--r--docs/configguide/pharosconfig.rst9
2 files changed, 9 insertions, 14 deletions
diff --git a/docs/configguide/configguide.rst b/docs/configguide/configguide.rst
index 5971590..3f1c035 100644
--- a/docs/configguide/configguide.rst
+++ b/docs/configguide/configguide.rst
@@ -9,19 +9,7 @@ Lab Setup Guide
Provides an overview for setting up a Pharos lab. A full set of
:ref:`pharos_master` documents are maintained in the *pharos* repo.
-Contributing to the Pharos Community
-------------------------------------
-
-The 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.
-
-* 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)*
-
-Declaring a Pharos Lab
-----------------------
+When setting up an OPNFV community lab ...
* Provide the Pharos community with details of the intended setup, including ...
diff --git a/docs/configguide/pharosconfig.rst b/docs/configguide/pharosconfig.rst
index 1f8c166..6b0783d 100644
--- a/docs/configguide/pharosconfig.rst
+++ b/docs/configguide/pharosconfig.rst
@@ -8,7 +8,14 @@
Pharos Configuration
********************
-Pharos configuration documents provide information on how to setup hardware and networks in a Pharos compliant lab
+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)*
.. toctree::