From 7505398129064b51304f50bcfec3b8803f31ba93 Mon Sep 17 00:00:00 2001 From: ChristopherPrice Date: Tue, 23 Feb 2016 12:42:23 +0100 Subject: please review, updates for release. Updated scenario matrix for the user guide. Updated config guide Change-Id: Ic1e55cacab47521c2428748e00458425c32a11af Signed-off-by: ChristopherPrice (cherry picked from commit d4134280f9acbf523454673931155ab4af9b42a0) --- docs/configguide/configoptions.rst | 2 +- docs/configguide/post-install.rst | 12 +++++++++++- docs/configguide/postinstall-fuel.rst | 4 ++++ docs/configguide/postinstall-yardstick.rst | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 docs/configguide/postinstall-fuel.rst create mode 100644 docs/configguide/postinstall-yardstick.rst (limited to 'docs/configguide') diff --git a/docs/configguide/configoptions.rst b/docs/configguide/configoptions.rst index 720abe275..cb5774a41 100644 --- a/docs/configguide/configoptions.rst +++ b/docs/configguide/configoptions.rst @@ -12,7 +12,7 @@ components aimed to solve specific problems for the deployment of VNF's. A scen components such as OpenStack, OpenDaylight, OVS, KVM etc. where each scenario will include different source components or configurations. -OPNFV Scenario's +OPNFV Scenarios ================ Each OPNFV scenario provides unique features and capabilities, it is important to understand diff --git a/docs/configguide/post-install.rst b/docs/configguide/post-install.rst index 0eca4ba08..c7bc27ea1 100644 --- a/docs/configguide/post-install.rst +++ b/docs/configguide/post-install.rst @@ -17,7 +17,7 @@ based on the tools and test suites available for the installation tool you have .. toctree:: - postinstall-ipv6 + postinstall-fuel .. toctree:: @@ -33,6 +33,11 @@ installed in your scenario: postinstall-copper +.. toctree:: + + postinstall-ipv6 + + Additional testing and validation activities ============================================ @@ -47,3 +52,8 @@ setting up these testing suites: .. toctree:: postinstall-vswitchperf + +.. toctree:: + + postinstall-yardstick + diff --git a/docs/configguide/postinstall-fuel.rst b/docs/configguide/postinstall-fuel.rst new file mode 100644 index 000000000..877e548cb --- /dev/null +++ b/docs/configguide/postinstall-fuel.rst @@ -0,0 +1,4 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +.. include:: ../projects/fuel/configguide/postinstall.rst diff --git a/docs/configguide/postinstall-yardstick.rst b/docs/configguide/postinstall-yardstick.rst new file mode 100644 index 000000000..841b47ff1 --- /dev/null +++ b/docs/configguide/postinstall-yardstick.rst @@ -0,0 +1,6 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +.. include:: ../projects/yardstick/userguide/comp-intro.rst +.. include:: ../projects/yardstick/userguide/03-installation.rst + -- cgit 1.2.3-korg