diff options
| author |   Sofia Wallin <sofia.wallin@ericsson.com> | 2017-05-04 21:22:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-04 21:22:45 +0000 |
| commit | e9447df97310de9f8aa1c68ba197193128c5ec40 (patch) | |
| tree | 977339bec1564f7d3152d68947d8d85c2fed6c26 | |
| parent | e442d15cc7a15f573a838207e8b85d91ab7a72b1 (diff) | |
| parent | 0a7438f9916b1ab56f764885595691155b13a57f (diff) | |
Merge "Adding sdnvpn for d-release"
| -rw-r--r-- | docs/featureprojects.rst | 13 | ||||
| -rw-r--r-- | docs/release/installation.introduction.rst | 2 | ||||
| -rw-r--r-- | docs/release/release-notes.rst | 2 | ||||
| -rw-r--r-- | docs/release/userguide.introduction.rst | 2 |
4 files changed, 19 insertions, 0 deletions
diff --git a/docs/featureprojects.rst b/docs/featureprojects.rst index 70f026237..ceda3d8e0 100644 --- a/docs/featureprojects.rst +++ b/docs/featureprojects.rst @@ -227,6 +227,19 @@ Promise ../submodules/promise/docs/development/manuals/index +SDNVPN +-------- +.. toctree:: + :maxdepth: 1 + + ../submodules/sdnvpn/docs/development/overview/index + ../submodules/sdnvpn/docs/development/requirements/index + ../submodules/sdnvpn/docs/release/installation/index + ../submodules/sdnvpn/docs/release/configguide/index + ../submodules/sdnvpn/docs/release/userguide/index + ../submodules/sdnvpn/docs/development/design/index + + SFC --- .. toctree:: diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst index 80ede186b..3c2e89dd9 100644 --- a/docs/release/installation.introduction.rst +++ b/docs/release/installation.introduction.rst @@ -55,6 +55,8 @@ description documents provided: - :ref:`os-odl_l2-fdio-ha <os-odl_l2-fdio-ha>` - :ref:`os-odl_l2-fdio-noha <os-odl_l2-fdio-noha>` - :ref:`os-nosdn-fdio-noha <os-nosdn-fdio-noha>` +- :ref:`os-odl_l2-bgpvpn-noha <sdnvpn-os-odl_l2-bgpvpn-noha>` +- :ref:`os-odl_l2-bgpvpn-ha <sdnvpn-os-odl_l2-bgpvpn-ha>` - :ref:`os-odl-gluon-noha <gluon-scenario>` - :ref:`os-nosdn-openo-ha <opera-os-nosdn-openo-ha>` - `os-odl_l2-sfc-ha <http://docs.opnfv.org/en/stable-danube/submodules/sfc/docs/release/scenarios/os-odl_l2-sfc-ha/index.html>`_ diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst index ad37c8b99..98d1fbd8e 100644 --- a/docs/release/release-notes.rst +++ b/docs/release/release-notes.rst @@ -46,6 +46,8 @@ Project release notes: :ref:`QTIP Release Notes <qtip-releasenotes>` +:ref:`SDNVPN Release Notes <sdnvpn-releasenotes>` + :ref:`SFC Release Notes <sfc-releasenotes>` :ref:`VSPERF Release Notes <vswitchperf-releasenotes>` diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst index 5a83b031a..d7e5f9334 100644 --- a/docs/release/userguide.introduction.rst +++ b/docs/release/userguide.introduction.rst @@ -65,6 +65,7 @@ Feature Configuration Guides - :ref:`Netready Configuration Guide <netready-configguide>` - :ref:`Parser Configuration Guide <parser-configguide>` - :ref:`Promise Configuration Guide <promise-configguide>` +- :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>` - :ref:`SFC Configuration Guide <sfc-configguide>` @@ -79,5 +80,6 @@ Feature User Guides - :ref:`Netready User Guide <netready-userguide>` - :ref:`Parser User Guide <parser-userguide>` - :ref:`Promise User Guide <promise-userguide>` +- :ref:`SDNVPN User Guide <sdnvpn-userguide>` - :ref:`SFC User Guide <sfc-userguide>` |