summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-14 02:58:05 +0000
committerGerrit Code Review <review@openstack.org>2018-09-14 02:58:05 +0000
commit39c79a27afd5892b6cf79d4570d054126563ae39 (patch)
tree6bd97ed0154e26d4ad232dc78a5877f185b9d97e
parent0fdbc4780ddbe9aa22a947f9fdf25c13c45df107 (diff)
parent643b53c04dda614901b2a30bf328de949489f796 (diff)
Merge "Link to the in-tree driver support matrix from multiattach docs"
-rw-r--r--doc/source/admin/blockstorage-volume-multiattach.rst5
-rw-r--r--doc/source/reference/support-matrix.rst2
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/admin/blockstorage-volume-multiattach.rst b/doc/source/admin/blockstorage-volume-multiattach.rst
index a8ea462..9b644d1 100644
--- a/doc/source/admin/blockstorage-volume-multiattach.rst
+++ b/doc/source/admin/blockstorage-volume-multiattach.rst
@@ -105,8 +105,8 @@ the chosen back end which is indicated through capabilities in the
105corresponding volume driver. 105corresponding volume driver.
106 106
107The reference implementation is available on LVM in the Queens release. You can 107The reference implementation is available on LVM in the Queens release. You can
108check the `Driver Support Matrix`_ for further information on which back end 108check the :ref:`Driver Support Matrix <driver_support_matrix>` for further
109provides the functionality. 109information on which back end provides the functionality.
110 110
111Policy rules 111Policy rules
112~~~~~~~~~~~~ 112~~~~~~~~~~~~
@@ -145,4 +145,3 @@ Known issues and limitations
145.. _`Nova`: https://specs.openstack.org/openstack/nova-specs/specs/queens/approved/cinder-volume-multi-attach.html 145.. _`Nova`: https://specs.openstack.org/openstack/nova-specs/specs/queens/approved/cinder-volume-multi-attach.html
146.. _`new Attach/Detach APIs were added to Cinder`: http://specs.openstack.org/openstack/cinder-specs/specs/ocata/add-new-attach-apis.html 146.. _`new Attach/Detach APIs were added to Cinder`: http://specs.openstack.org/openstack/cinder-specs/specs/ocata/add-new-attach-apis.html
147.. _`Cinder's specs list`: https://specs.openstack.org/openstack/cinder-specs/index.html 147.. _`Cinder's specs list`: https://specs.openstack.org/openstack/cinder-specs/index.html
148.. _`Driver Support Matrix`: https://wiki.openstack.org/wiki/CinderSupportMatrix
diff --git a/doc/source/reference/support-matrix.rst b/doc/source/reference/support-matrix.rst
index 53f3158..eeea31e 100644
--- a/doc/source/reference/support-matrix.rst
+++ b/doc/source/reference/support-matrix.rst
@@ -53,6 +53,8 @@ matrix we include the list of required functions here for reference.
53 Since the above functions are required their support is assumed and the 53 Since the above functions are required their support is assumed and the
54 matrix only includes support for optional functionality. 54 matrix only includes support for optional functionality.
55 55
56.. _driver_support_matrix:
57
56.. support_matrix:: support-matrix.ini 58.. support_matrix:: support-matrix.ini
57 59
58Driver Removal History 60Driver Removal History