From 20aa3d59def0c2449766d0c84a5c3c00493c90de Mon Sep 17 00:00:00 2001
From: Sofia Wallin <sofia.wallin@ericsson.com>
Date: Mon, 22 Oct 2018 11:00:38 +0200
Subject: [PATCH] Transition stor4nfv docs away from submodules

Uses intersphinx linking to reference stor4nfv documentation hosted on
RTD.

Change-Id: I0e2dcf599073c6e59645e064ddacb3ef6289d084
Signed-off-by: Sofia Wallin <sofia.wallin@est.tech>
---
 .gitmodules                             | 5 -----
 docs/conf.py                            | 1 +
 docs/release/userguide.introduction.rst | 4 ++--
 docs/submodules/stor4nfv                | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 160000 docs/submodules/stor4nfv

diff --git a/.gitmodules b/.gitmodules
index 6875c2268..601d6f913 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -118,11 +118,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 08b1d6f38..10905d144 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -293,3 +293,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/userguide.introduction.rst b/docs/release/userguide.introduction.rst
index aa8801789..fbf6ea8e8 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-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/stor4nfv b/docs/submodules/stor4nfv
deleted file mode 160000
index 56bf48111..000000000
--- a/docs/submodules/stor4nfv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56bf48111d4e7f0664789f5b6a567ce2c66d0b8b
-- 
2.16.6