diff options
| -rw-r--r-- | .gitmodules | 10 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/release/installation.introduction.rst | 34 | ||||
| -rw-r--r-- | docs/release/release-notes.rst | 2 | ||||
| -rw-r--r-- | docs/release/userguide.introduction.rst | 4 | ||||
| m--------- | docs/submodules/apex | 0 | ||||
| m--------- | docs/submodules/clover | 0 | ||||
| m--------- | docs/submodules/doctor | 0 | ||||
| m--------- | docs/submodules/dovetail | 0 | ||||
| m--------- | docs/submodules/functest | 0 | ||||
| m--------- | docs/submodules/kvmfornfv | 0 | ||||
| m--------- | docs/submodules/nfvbench | 0 | ||||
| m--------- | docs/submodules/releng-xci | 0 | ||||
| m--------- | docs/submodules/samplevnf | 0 | ||||
| m--------- | docs/submodules/sdnvpn | 0 | ||||
| m--------- | docs/submodules/sfc | 0 | ||||
| m--------- | docs/submodules/stor4nfv | 0 | ||||
| m--------- | docs/submodules/vswitchperf | 0 | ||||
| m--------- | docs/submodules/yardstick | 0 |
19 files changed, 22 insertions, 29 deletions
diff --git a/.gitmodules b/.gitmodules index c1e8f4d97..52974e156 100644 --- a/.gitmodules +++ b/.gitmodules @@ -53,11 +53,6 @@ url = ../joid branch = . ignore = dirty -[submodule "docs/submodules/kvmfornfv"] - path = docs/submodules/kvmfornfv - url = ../kvmfornfv - branch = . - ignore = dirty [submodule "docs/submodules/multisite"] path = docs/submodules/multisite url = ../multisite @@ -118,11 +113,6 @@ url = ../storperf branch = . ignore = dirty -[submodule "docs/submodules/stor4nfv"] - path = docs/submodules/stor4nfv - url = ../stor4nfv - branch = . - ignore = dirty [submodule "docs/submodules/ves"] path = docs/submodules/ves url = ../ves diff --git a/docs/conf.py b/docs/conf.py index 1426d71e2..27be952b3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -294,3 +294,4 @@ intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest' intersphinx_mapping['ovn4nfv'] = ('https://opnfv-ovn4nfv.readthedocs.io/en/%s' % branch, None) intersphinx_mapping['fuel'] = ('https://opnfv-fuel.readthedocs.io/en/%s' % branch, None) intersphinx_mapping['auto'] = ('https://opnfv-auto.readthedocs.io/en/%s' % branch, None) +intersphinx_mapping['stor4nfv'] = ('https://opnfv-stor4nfv.readthedocs.io/en/%s' % branch, None) diff --git a/docs/release/installation.introduction.rst b/docs/release/installation.introduction.rst index 4c62e56f2..922b6e7ff 100644 --- a/docs/release/installation.introduction.rst +++ b/docs/release/installation.introduction.rst @@ -48,28 +48,28 @@ where each scenario will include different source components or configurations. To learn more about the scenarios supported in the Fraser release refer to the scenario description documents provided: -- :ref:`k8-nosdn-lb-noha <k8-nosdn-lb-noha>` -- :ref:`k8-ovn-lb-noha <k8-ovn-lb-noha>` -- :ref:`k8-nosdn-lb_ceph-noha <k8-nosdn-lb_ceph-noha>` -- :ref:`k8-canal-lb-noha <k8-canal-lb-noha>` -- :ref:`os-nosdn-ovs-noha <os-nosdn-ovs-noha1>` -- :ref:`os-nosdn-ovs-ha <os-nosdn-ovs-ha1>` -- :ref:`os-nosdn-bar-ha <os-nosdn-bar-ha>` -- :ref:`os-nosdn-bar-noha <os-nosdn-bar-noha>` - :ref:`k8-nosdn-stor4nfv-ha <k8-nosdn-stor4nfv-ha>` -- :ref:`os-nosdn-bar-ha <kvmfornfv-os-nosdn-bar-ha>` -- :ref:`os-nosdn-bar-noha <kvmfornfv-os-nosdn-bar-noha>` +- :ref:`os-nosdn-bar-ha <os-nosdn-bar-ha>` +- :ref:`os-nosdn-stor4nfv-ha <os-nosdn-stor4nfv-ha>` +- :ref:`os-nosdn-calipso-noha <os-nosdn-calipso-noha>` - :ref:`os-nosdn-ovs-noha <os-nosdn-ovs-noha>` - :ref:`os-nosdn-ovs-ha <os-nosdn-ovs-ha>` -- :ref:`os-odl-sfc-ha <os-odl-sfc-ha>` -- :ref:`os-odl-sfc-noha <os-odl-sfc-noha>` +- :ref:`os-nosdn-vpp-noha <os-nosdn-vpp-noha>` +- :ref:`os-nosdn-vpp-ha <os-nosdn-vpp-ha>` +- :ref:`os-odl-ovs-noha <os-odl-ovs-noha>` +- :ref:`os-odl-sfc-noha-xci <os-odl-sfc-noha>` +- :ref:`os-odl-sfc-noha-apex <os-odl-sfc-noha2>` +- :ref:`os-odl-sfc-noha-compass <os-odl-sfc-noha3>` +- :ref:`os-odl-sfc-ha-apex <os-odl-sfc-ha>` +- :ref:`os-odl-sfc-ha-compass <os-odl-sfc-ha2>` - :ref:`os-odl-bgpvpn-noha <os-odl-bgpvpn-noha>` - :ref:`os-odl-bgpvpn-ha <os-odl-bgpvpn-ha>` -- :ref:`os-nosdn-lxd-ha <os-nosdn-lxd-ha>` -- :ref:`os-nosdn-fdio-noha <os-nosdn-fdio-noha>` -- :ref:`os-nosdn-fdio-ha <os-nosdn-fdio-ha>` -- :ref:`os-odl-sfc-ha <os-odl-sfc-ha>` -- :ref:`os-odl-sfc-noha <os-odl-sfc-noha>` +- :ref:`os-odl-bgpvpn-noha <os-odl-bgpvpn-noha>` +- :ref:`os-odl-bgpvpn-ha-xci <os-odl-bgpvpn-ha2>` +- :ref:`os-nosdn-bar-ha <os-nosdn-bar-ha>` +- :ref:`os-nosdn-bar-noha <os-nosdn-bar-noha>` +- :ref:`k8-nosdn-virtlet-noha <k8-nosdn-virtlet-noha>` +- :ref:`k8-ovn-kata-noha <k8-ovn-kata-noha>` Installation Procedure ====================== diff --git a/docs/release/release-notes.rst b/docs/release/release-notes.rst index 771c9a77b..4a5000d28 100644 --- a/docs/release/release-notes.rst +++ b/docs/release/release-notes.rst @@ -46,6 +46,8 @@ Project release notes: :ref:`OVN4NFV Release Notes <ovn4nfv-releasenotes>` +:ref:`Promise Release Notes <promise-releasenotes>` + :ref:`SampleVNF Release Notes <samplevnf-releasenotes>` :ref:`SDNVPN Release Notes <sdnvpn-releasenotes>` diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst index 412cdbc0a..1a8a096ba 100644 --- a/docs/release/userguide.introduction.rst +++ b/docs/release/userguide.introduction.rst @@ -75,7 +75,7 @@ Feature Configuration Guides - :ref:`Promise Configuration Guide <promise:promise-configguide>` - :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>` - :ref:`SFC Configuration Guide <sfc-configguide>` -- :ref:`Stor4NFV Configuration Guide <stor4nfv-configguide>` +- :ref:`Stor4NFV Configuration Guide <stor4nfv:stor4nfv-configguide>` Feature User Guides =================== @@ -97,4 +97,4 @@ Feature User Guides - :ref:`Parser User Guide <parser-userguide>` - :ref:`SDNVPN User Guide <sdnvpn-userguide>` - :ref:`SFC User Guide <sfc-userguide>` -- :ref:`Stor4NFV User Guide <stor4nfv-userguide>` +- :ref:`Stor4NFV User Guide <stor4nfv:stor4nfv-userguide>` diff --git a/docs/submodules/apex b/docs/submodules/apex -Subproject 498356c9efb765a5714845ce8303dc8a264eb30 +Subproject be1a60fcde0c122266e8c074df729a1be75f560 diff --git a/docs/submodules/clover b/docs/submodules/clover -Subproject 257e0d846ade5b1051c3734ad6a2d5bea4ce4ca +Subproject 9bdb6dc9353992219721acba6b9c4576dbb38ec diff --git a/docs/submodules/doctor b/docs/submodules/doctor -Subproject 2ca5924081ce4784f599437707bd32807aa155c +Subproject 5b3f5937e7b861fca46b2a6b2d6708866b800f9 diff --git a/docs/submodules/dovetail b/docs/submodules/dovetail -Subproject 7cd5c4c60b3f9a9893c2801a39061489ecfa6ae +Subproject 41392d61f366130d089bccfff5cd1b08bc0bb5d diff --git a/docs/submodules/functest b/docs/submodules/functest -Subproject aa6ee5d5f9013da722643c5eca8396135d0191b +Subproject e715a8309122c3fa3b4983cfa53c82519dd6ead diff --git a/docs/submodules/kvmfornfv b/docs/submodules/kvmfornfv deleted file mode 160000 -Subproject 5f28ffec33fb4b548353854abf51ff75b9814c3 diff --git a/docs/submodules/nfvbench b/docs/submodules/nfvbench -Subproject ed33e56c9b8771ed9d22fc3cc19e049a76137db +Subproject f1d59a8130dce2ac9295bc5495e628fdb752b74 diff --git a/docs/submodules/releng-xci b/docs/submodules/releng-xci -Subproject e340bbdce220b4f11896267e20981a887ba0c10 +Subproject 348bb6a8cea2b12ceca8941fa46e8290b18f0a5 diff --git a/docs/submodules/samplevnf b/docs/submodules/samplevnf -Subproject ffdcfa6b834d3ad00188ee9805370d6aefc44b4 +Subproject 982b7abba88d0a72219da7220109a05fdcee290 diff --git a/docs/submodules/sdnvpn b/docs/submodules/sdnvpn -Subproject 3dcc7e7801c39053e08bdc6c45402267d31ae56 +Subproject b17b3d80849b9c9989fb4deeb6001a6ff78261c diff --git a/docs/submodules/sfc b/docs/submodules/sfc -Subproject 59697c6c0425b3179f0a51e92de7dc035c1ff38 +Subproject 6c11ccaa5e9f036a1b56926d80aaccb3dc5e3d7 diff --git a/docs/submodules/stor4nfv b/docs/submodules/stor4nfv deleted file mode 160000 -Subproject cefd1d0854ee948acc7147834146914983a1155 diff --git a/docs/submodules/vswitchperf b/docs/submodules/vswitchperf -Subproject bc569ef41ec4120ee63bfa43c2b647cd96957cc +Subproject 96de8654952a606d28d56c057ba871b5553e417 diff --git a/docs/submodules/yardstick b/docs/submodules/yardstick -Subproject fdd8206d8f3d456fa3e3b56630e7449d55a7125 +Subproject bdf55c2a6f000e0ca6462a9df4a0d411c3dd029 |