From a1d03f18ff4fed1dd903834b03dd3957928feffd Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 19 Mar 2018 17:11:33 -0400 Subject: [PATCH] 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 --- .gitmodules | 5 ----- docs/conf.py | 3 +++ docs/developer-guide/index.rst | 4 +++- docs/getting-started-guide/project-specific-guides/index.rst | 3 ++- docs/opendaylight-with-openstack/index.rst | 3 ++- docs/submodules/netvirt | 1 - docs/user-guide/index.rst | 3 ++- 7 files changed, 12 insertions(+), 10 deletions(-) delete mode 160000 docs/submodules/netvirt diff --git a/.gitmodules b/.gitmodules index 1fca10fd6..efb406cc8 100644 --- 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 496bbbbe5..1fbea08e1 100755 --- 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 ddb08c430..42ad98c57 100644 --- a/docs/developer-guide/index.rst +++ b/docs/developer-guide/index.rst @@ -14,6 +14,9 @@ Overview Project-specific Developer Guides --------------------------------- + +* :doc:`NetVirt Documentation ` + .. 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 316ab51b6..ff2d875b2 100644 --- 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 ` + .. 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 9c573c981..647e0ae58 100644 --- 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 ` + .. 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 index e3af1e929..000000000 --- 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 59e950930..dbd8bb03d 100644 --- 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 ` + .. 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 -- 2.36.6