Link to NetVirt RTD guides rather than local copy

NetVirt is now generating it's own guides under the
docs.opendaylight.org/projects/netvirt URL so link to that
path instead of maintaining a local copy.

Change-Id: I0369168b70a6322881ba08f0f590eed58c22f272
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/.gitmodules b/.gitmodules
index 1fca10fd64abc0fc59e984ccbf1433c9b41e84a5..efb406cc897649664044e506dde0b21044e0b7ad 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,11 +23,6 @@
        url = ../odlparent
        branch = .
        ignore = dirty
-[submodule "docs/submodules/netvirt"]
-       path = docs/submodules/netvirt
-       url = ../netvirt
-       branch = .
-       ignore = dirty
 [submodule "docs/submodules/genius"]
        path = docs/submodules/genius
        url = ../genius

diff --git a/docs/conf.py b/docs/conf.py
index 496bbbbe57827f80536ed66186fb07fd77e3509f..1fbea08e17689e990bf0429332cc9a67842cf443 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,6 +16,9 @@ from docs_conf.conf import *
 intersphinx_mapping['odl-integration-test'] = ('http://docs.opendaylight.org/projects/integration-test/en/latest/', None)
 intersphinx_mapping['odl-releng-builder'] = ('http://docs.opendaylight.org/projects/releng-builder/en/latest/', None)
 
+# Projects that have stable/branches
+intersphinx_mapping['netvirt'] = ('http://docs.opendaylight.org/projects/netvirt/en/latest/', None)
+
 linkcheck_ignore = [
     # Ignore jenkins because it's often slow to respond.
     'https://jenkins.opendaylight.org/releng',

diff --git a/docs/developer-guide/index.rst b/docs/developer-guide/index.rst
index ddb08c430424dd1cbd30bfd51e1d66efd3199889..42ad98c577e6682f5513c2d8518b43452d7e0d6f 100644 (file)
--- a/docs/developer-guide/index.rst
+++ b/docs/developer-guide/index.rst
@@ -14,6 +14,9 @@ Overview
 
 Project-specific Developer Guides
 ---------------------------------
+
+* :doc:`NetVirt Documentation <netvirt:index>`
+
 .. toctree::
    :maxdepth: 1
 
@@ -43,7 +46,6 @@ Project-specific Developer Guides
    netconf-developer-guide
    network-intent-composition-(nic)-developer-guide
    netide-developer-guide
-   ../submodules/netvirt/docs/index
    neutron-service-developer-guide
    neutron-northbound
    odl-parent-developer-guide

diff --git a/docs/getting-started-guide/project-specific-guides/index.rst b/docs/getting-started-guide/project-specific-guides/index.rst
index 316ab51b6d429e726df47a1dfbbea4f7d162ad01..ff2d875b2e73409702f5df16b7b61e4d1de002a2 100644 (file)
--- a/docs/getting-started-guide/project-specific-guides/index.rst
+++ b/docs/getting-started-guide/project-specific-guides/index.rst
@@ -2,11 +2,12 @@
 Project-Specific Installation Guides
 ************************************
 
+* :doc:`NetVirt Documentation <netvirt:index>`
+
 .. toctree::
    :maxdepth: 1
 
    centinel
-   ../../submodules/netvirt/docs/index
    opflex
    tsdr
    vtn

diff --git a/docs/opendaylight-with-openstack/index.rst b/docs/opendaylight-with-openstack/index.rst
index 9c573c9816ad87752b9b4545a366b5b8b42bb399..647e0ae58260a97b59695111e679f341366936bc 100644 (file)
--- a/docs/opendaylight-with-openstack/index.rst
+++ b/docs/opendaylight-with-openstack/index.rst
@@ -37,10 +37,11 @@ see each other.
 Installing OpenDaylight
 ***********************
 
+* :doc:`NetVirt Documentation <netvirt:index>`
+
 .. toctree::
    :maxdepth: 1
 
-   ../submodules/netvirt/docs/index
    openstack-with-ovsdb
    openstack-with-gbp
    openstack-with-gbp-vpp

diff --git a/docs/submodules/netvirt b/docs/submodules/netvirt
deleted file mode 160000 (submodule)
index e3af1e9..0000000
--- a/docs/submodules/netvirt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e3af1e9297f14728d015d67823b0ff417520b741

diff --git a/docs/user-guide/index.rst b/docs/user-guide/index.rst
index 59e950930643c0150f19656552b14a164c5ffbec..dbd8bb03db7cd101d57b9afa859f0f99a54c91c1 100644 (file)
--- a/docs/user-guide/index.rst
+++ b/docs/user-guide/index.rst
@@ -20,6 +20,8 @@ the OpenDaylight Release using the generic base functionality.
 Project-specific User Guides
 ----------------------------
 
+* :doc:`NetVirt Documentation <netvirt:index>`
+
 .. toctree::
    :maxdepth: 1
 
@@ -45,7 +47,6 @@ Project-specific User Guides
    nemo-user-guide
    netconf-user-guide
    netide-user-guide
-   ../submodules/netvirt/docs/index
    neutron-service-user-guide
    network-intent-composition-(nic)-user-guide
    ocp-plugin-user-guide