summaryrefslogtreecommitdiffstats
path: root/docs/configguide
diff options
context:
space:
mode:
authorChristopherPrice <christopher.price@ericsson.com>2016-02-24 23:20:43 +0100
committerChristopher Price <christopher.price@ericsson.com>2016-02-25 00:49:17 +0000
commit0e3d3581cb46a7e5cf6703fd4916d8479f9438a3 (patch)
treef6bd875052a1736050581250245fe7b08ab44ed0 /docs/configguide
parent455f9662cea68d33e8c1b44a64f17f4327ccf3b2 (diff)
Updating the overview doc with recent comments.
Change-Id: I181279f9b0a4330bb98a3e0d40ecb2687d976b92 Signed-off-by: ChristopherPrice <christopher.price@ericsson.com> (cherry picked from commit 4cb9b020b922c090061a2dee77fa8ad77394d7b9)
Diffstat (limited to 'docs/configguide')
-rw-r--r--docs/configguide/installer-config.rst9
-rw-r--r--docs/configguide/pharos-config.rst5
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/configguide/installer-config.rst b/docs/configguide/installer-config.rst
index 3569d4ed2..a88d1f50e 100644
--- a/docs/configguide/installer-config.rst
+++ b/docs/configguide/installer-config.rst
@@ -6,6 +6,15 @@
Installer Configuration
=======================
+Installing the OPNFV platform requires either a physical environment as defined in the
+Pharos lab specification, or a virtual infrastructure. When configuring a physical infrastructure
+it is strongly advised to follow the Pharos configuration material.
+
+.. toctree::
+
+ pharos-config
+
+
The following sections describe the per installer configuration options.
Further details for each installer are captured in the referred project documentation.
diff --git a/docs/configguide/pharos-config.rst b/docs/configguide/pharos-config.rst
new file mode 100644
index 000000000..013e21b34
--- /dev/null
+++ b/docs/configguide/pharos-config.rst
@@ -0,0 +1,5 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+.. include:: ../projects/pharos/configguide/configguide.rst
+.. include:: ../projects/pharos/configguide/jumpserverinstall.rst