Update git submodules for Promise

Transition to local documentation build for Promise as defined at:

https://docs.opnfv.org/en/latest/how-to-use-docs/local-build-transition.html

Change-Id: Icd35cd7b1c56a9de8625a685a8495067cfe60431
Signed-off-by: Bertrand Souville <souville@docomolab-euro.com>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/.gitmodules b/.gitmodules
index dc5e861..c1e8f4d 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -98,11 +98,6 @@
        url = ../pharos
        branch = .
        ignore = dirty
        url = ../pharos
        branch = .
        ignore = dirty

-[submodule "docs/submodules/promise"]
-       path = docs/submodules/promise
-       url = ../promise
-       branch = .
-       ignore = dirty

 [submodule "docs/submodules/qtip"]
        path = docs/submodules/qtip
        url = ../qtip
 [submodule "docs/submodules/qtip"]
        path = docs/submodules/qtip
        url = ../qtip

diff --git a/docs/conf.py b/docs/conf.py
index 08b1d6f..1426d71 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -289,6 +289,7 @@ intersphinx_mapping['armband'] = ('https://opnfv-armband.readthedocs.io/en/%s' %
 intersphinx_mapping['copper'] = ('https://opnfv-copper.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['moon'] = ('https://opnfv-moon.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['netready'] = ('https://opnfv-netready.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['copper'] = ('https://opnfv-copper.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['moon'] = ('https://opnfv-moon.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['netready'] = ('https://opnfv-netready.readthedocs.io/en/%s' % branch, None)

+intersphinx_mapping['promise'] = ('https://opnfv-promise.readthedocs.io/en/%s' % branch, None)

 intersphinx_mapping['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest', None)
 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['releng'] = ('https://opnfv-releng.readthedocs.io/en/latest', None)
 intersphinx_mapping['ovn4nfv'] = ('https://opnfv-ovn4nfv.readthedocs.io/en/%s' % branch, None)
 intersphinx_mapping['fuel'] = ('https://opnfv-fuel.readthedocs.io/en/%s' % branch, None)

diff --git a/docs/release/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index e98fb51..412cdbc 100644 (file)
--- a/docs/release/userguide.introduction.rst
+++ b/docs/release/userguide.introduction.rst
@@ -72,7 +72,7 @@ Feature Configuration Guides
 - :ref:`OVN4NFV Configuration Guide <xyz-configguide>`
 - :ref:`OVNO Configuration Guide <ovno-configguide>`
 - :ref:`Parser Configuration Guide <parser-configguide>`
 - :ref:`OVN4NFV Configuration Guide <xyz-configguide>`
 - :ref:`OVNO Configuration Guide <ovno-configguide>`
 - :ref:`Parser Configuration Guide <parser-configguide>`

-- :ref:`Promise Configuration Guide <promise-configguide>`
+- :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:`SDNVPN Configuration Guide <sdnvpn-configguide>`
 - :ref:`SFC Configuration Guide <sfc-configguide>`
 - :ref:`Stor4NFV Configuration Guide <stor4nfv-configguide>`


@@ -95,7 +95,6 @@ Feature User Guides
 - :ref:`OVN4NFV User Guide <xyz-userguide>`
 - :ref:`OVNO User Guide <ovno-userguide>`
 - :ref:`Parser User Guide <parser-userguide>`
 - :ref:`OVN4NFV User Guide <xyz-userguide>`
 - :ref:`OVNO User Guide <ovno-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>`
 - :ref:`Stor4NFV User Guide <stor4nfv-userguide>`
 - :ref:`SDNVPN User Guide <sdnvpn-userguide>`
 - :ref:`SFC User Guide <sfc-userguide>`
 - :ref:`Stor4NFV User Guide <stor4nfv-userguide>`

diff --git a/docs/submodules/promise b/docs/submodules/promise
deleted file mode 160000 (submodule)
index 2e2fe83..0000000
--- a/docs/submodules/promise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e2fe83863b28a152e2ba6d2ed65c872555fd3a2