diff options
| author |   joehuang <joehuang@huawei.com> | 2016-09-20 05:20:31 -0400 |
|---|---|---|
| committer | joehuang <joehuang@huawei.com> | 2016-09-20 05:27:44 -0400 |
| commit | 3f7394289faa2945e8f36d008cfb7dacf06279d6 (patch) | |
| tree | de4c58563b7db1ebb33122ae1b4367b640e801eb /docs/configurationguide/configuration.options.render.rst | |
| parent | b50a7a8c4d2f4a1e63b7dce077f9d3f726661a15 (diff) | |
Cherry Pick the update from the master branch to stable/colorado branch
These patches should be cherry picked to colorado branch:
https://gerrit.opnfv.org/gerrit/#/c/20077/
https://gerrit.opnfv.org/gerrit/#/c/20635/
https://gerrit.opnfv.org/gerrit/#/c/19833/
https://gerrit.opnfv.org/gerrit/#/c/19587/
But because the structure of the folder was changed in
https://gerrit.opnfv.org/gerrit/#/c/19833/
cherry pick using gerrit will lead to merge conflict,
has to update the colorado branch through this patch.
Change-Id: I971eb28520b47b14de52a761269518b959c6921c
Signed-off-by: joehuang <joehuang@huawei.com>
Diffstat (limited to 'docs/configurationguide/configuration.options.render.rst')
| -rw-r--r-- | docs/configurationguide/configuration.options.render.rst | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/docs/configurationguide/configuration.options.render.rst b/docs/configurationguide/configuration.options.render.rst deleted file mode 100644 index f1dc11a..0000000 --- a/docs/configurationguide/configuration.options.render.rst +++ /dev/null @@ -1,27 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) Christopher Price (Ericsson AB) - -===================== -Configuration Options -===================== - -OPNFV provides a variety of virtual infrastructure deployments called scenarios designed to -host Virtualised Network Functions(VNFs). Each scenario provide specific capabilities and/or -components aimed to solve specific problems for the deployment of VNF's. A scenario may include -components such as OpenStack, OpenDaylight, OVS, KVM etc. where each scenario will include -different source components or configurations. - -OPNFV Scenarios -=============== - -Each OPNFV scenario provides unique features and capabilities, it is important to understand -your target platform capabilities before installing and configuring your target scenario. -This configuration guide outlines how to install and configure components in order to enable -the features you require. - -.. include:: ../scenario/scenariomatrix.rst - -This document will describe how to install and configure your target OPNFV scenarios. -Remember to check the associated validation procedures section following your installation for -details of the use cases and tests that have been run. |