Switch Releng from submodules to intersphinx

Removes the releng submodule, adds the pre-installed intersphinx to the
list of extentions, and updates the releng links to point to the RTD
site.

Change-Id: I334077920e7aebbecc7e91d586110617622bb609
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/.gitmodules b/.gitmodules
index 4d6455b..f0511b5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -148,10 +148,6 @@
        url = ../qtip
        branch = .
        ignore = dirty
-[submodule "docs/submodules/releng"]
-       path = docs/submodules/releng
-       url = ../releng
-       branch = master
 [submodule "docs/submodules/sdnvpn"]
        path = docs/submodules/sdnvpn
        url = ../sdnvpn

diff --git a/docs/conf.py b/docs/conf.py
index 9d9f281..45de7d6 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,8 @@ needs_sphinx = '1.3'
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = ['sphinxcontrib.httpdomain', 'sphinx.ext.autodoc',
-              'sphinx.ext.viewcode', 'sphinx.ext.napoleon']
+              'sphinx.ext.viewcode', 'sphinx.ext.napoleon',
+              'sphinx.ext.intersphinx']
 # Disable javasphinx generation until we have a solution to long build
 # times. readthedocs timesout after 902 seconds.
 
@@ -278,5 +279,5 @@ html_sidebars = {'**': ['localtoc.html', 'relations.html'],}
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 # texinfo_no_detailmenu = False
 
-# intersphinx_mapping =
-# {'RTD':('http://opnfvdocsdemo.readthedocs.io/projects/', None)}
+intersphinx_mapping = {}
+intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest', None)

diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index a6323ef..97429a5 100644 (file)
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -10,5 +10,5 @@ Continuous Integration - CI
 
 Please see the details of CI from the chapters below.
 
-- :ref:`CI Overview <ci-overview>`
-- :ref:`CI User Guide <ci-user-guide>`
+- :ref:`CI Overview <releng:ci-overview>`
+- :ref:`CI User Guide <releng:ci-user-guide>`

diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 1bd7920..3100907 100644 (file)
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -41,10 +41,7 @@ TBD
 Software Infrastructure
 -----------------------
 
-.. toctree::
-   :maxdepth: 1
-
-   ../submodules/releng/docs/infra/index
+- :ref:`releng:software-infrastructure`
 
 Security
 --------