4

Steven Smith · Steven Smith · commit 6e0cfb2eceb2 · 2022-12-15T15:09:26.000-05:00
diff --git a/_topic_maps/_topic_map_ms.yml b/_topic_maps/_topic_map_ms.yml
@@ -121,14 +121,13 @@ Dir: microshift_storage
 Distros: microshift
 Topics:
 - Name: MicroShift storage overview
-  File: microshift-storage-overview
+  File: index
 - Name: Understanding ephemeral storage for MicroShift
   File: understanding-ephemeral-storage-microshift
 - Name: Understanding persistent storage for MicroShift
   File: understanding-persistent-storage-microshift
 - Name: Configuring persistent storage for MicroShift
   Dir:  persistent_storage_microshift
-  Distros: microshift
   Topics:
   - Name: MicroShift storage plugin overview
     File: microshift-storage-plugin-overview
@@ -169,16 +168,6 @@ Topics:
 #   - Name: Configuring multitenant isolation with network policy
 #     File: multitenant-network-policy
 # ---
-# Name: Storage
-# Dir: storage
-# Distros: microshift
-# Topics:
-# - Name: Persistent storage
-#   Dir: persistent_storage
-#   Topics:
-#   - Name: Persistent storage using ODF-LVM
-#     File: microshift-persistent-storage-odf-lvm
-# ---
 # Name: Updating clusters
 # Dir: updating
 # Distros: microshift
diff --git a/microshift_storage/_attributes b/microshift_storage/_attributes
diff --git a/microshift_storage/container_storage_interface_microshift/images b/microshift_storage/container_storage_interface_microshift/images
@@ -1 +1 @@
-../images
+../../images
diff --git a/microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc b/microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
@@ -2,7 +2,7 @@
 [id="persistent-storage-csi-microshift"]
 = Configuring CSI volumes for MicroShift
 include::_attributes/attributes-microshift.adoc[]
-:context: persistent-storage-csi-storage-microshift
+:context: persistent-storage-csi-microshift
 
 toc::[]
 
diff --git a/microshift_storage/dynamic-provisioning-microshift.adoc b/microshift_storage/dynamic-provisioning-microshift.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
 [id="dynamic-provisioning-microshift"]
-= Dynamic provisioning for MicroShift
+= Dynamic provisioning for {product-title} 
 include::_attributes/attributes-microshift.adoc[]
-:context: microshift-dynamic-provisioning
+:context: dynamic-provisioning-microshift
 
 toc::[]
 
diff --git a/microshift_storage/expanding-persistent-volumes-microshift.adoc b/microshift_storage/expanding-persistent-volumes-microshift.adoc
@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="expanding-persistent-volumes-microshift"]
-= Expanding persistent volumes for MicroShift
+= Expanding persistent volumes for {product-title}
 include::_attributes/common-attributes.adoc[]
 :context: expanding-persistent-volumes-microshift
 
@@ -10,12 +10,16 @@ include::modules/storage-expanding-add-volume-expansion.adoc[leveloffset=+1]
 
 include::modules/storage-expanding-csi-volumes.adoc[leveloffset=+1]
 
-:FeatureName: Expanding CSI volumes
-
 include::modules/storage-expanding-flexvolume.adoc[leveloffset=+1]
 
 include::modules/storage-expanding-local-volumes.adoc[leveloffset=+1]
 
 include::modules/storage-expanding-filesystem-pvc.adoc[leveloffset=+1]
 
 include::modules/storage-expanding-recovering-failure.adoc[leveloffset=+1]
+
+
+[role="_additional-resources"]
+.Additional resources 
+
+* The controlling `StorageClass` object has `allowVolumeExpansion` set to `true` (see xref:../microshift_storage/expanding-persistent-volumes-microshift.html#add-volume-expansion_expanding-persistent-volumes-microshift[Enabling volume expansion support]).
diff --git a/microshift_storage/generic-ephemeral-volumes-microshift.adoc b/microshift_storage/generic-ephemeral-volumes-microshift.adoc
@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="generic-ephemeral-volumes-microshift"]
-= Generic ephemeral volumes for MicroShift
+= Generic ephemeral volumes for {product-title}
 include::_attributes/common-attributes.adoc[]
 :context: generic-ephemeral-volumes-microshift
 
diff --git a/microshift_storage/index.adoc b/microshift_storage/index.adoc
@@ -1,15 +1,15 @@
 :_content-type: ASSEMBLY
-[id="microshift-storage-overview"]
+[id="storage-overview-microshift"]
 = {product-title} storage overview
 include::_attributes/attributes-microshift.adoc[]
 :context: storage-overview-microshift
 
 toc::[]
 
-{product-title} supports multiple types of storage, both for on-premise and cloud providers. You can manage container storage for persistent and non-persistent data in an {product-title} cluster.
+{product-title} supports multiple types of storage, both for on-premise and cloud providers. You can manage container storage for persistent and non-persistent data in a {product-title} cluster.
 
 [id="microshift-storage-types"]
-== Storage Types
+== Storage types
 
 {product-title} storage is broadly classified into two categories, namely ephemeral storage and persistent storage.
 
diff --git a/microshift_storage/persistent_storage_microshift/_attributes b/microshift_storage/persistent_storage_microshift/_attributes
@@ -0,0 +1 @@
+../_attributes
diff --git a/microshift_storage/persistent_storage_microshift/images b/microshift_storage/persistent_storage_microshift/images
@@ -0,0 +1 @@
+../../images
diff --git a/microshift_storage/persistent_storage_microshift/microshift-storage-plugin-overview.adoc b/microshift_storage/persistent_storage_microshift/microshift-storage-plugin-overview.adoc
@@ -1,8 +1,8 @@
 :_content-type: ASSEMBLY
 [id="microshift-storage-plugin-overview"]
-= MicroShift storage plugin overview 
+= MicroShift storage plug-in overview 
 include::_attributes/common-attributes.adoc[]
-:context: persistent-storage-csi
+:context: microshift-storage-plugin-overview
 
 toc::[]
 
diff --git a/microshift_storage/persistent_storage_microshift/modules b/microshift_storage/persistent_storage_microshift/modules
@@ -0,0 +1 @@
+../modules
diff --git a/microshift_storage/persistent_storage_microshift/snippets b/microshift_storage/persistent_storage_microshift/snippets
@@ -0,0 +1 @@
+../snippets/
diff --git a/microshift_storage/understanding-ephemeral-storage-microshift.adoc b/microshift_storage/understanding-ephemeral-storage-microshift.adoc
@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="understanding-ephemeral-storage-microshift"]
-= Understanding ephemeral storage for MicroShift
+= Understanding ephemeral storage for {product-title}
 include::_attributes/attributes-microshift.adoc[]
 :context: understanding-ephemeral-storage-microshift
 
diff --git a/microshift_storage/understanding-persistent-storage-microshift.adoc b/microshift_storage/understanding-persistent-storage-microshift.adoc
@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="understanding-persistent-storage-microshift"]
-= Understanding persistent storage for MicroShift
+= Understanding persistent storage for {product-title}
 include::_attributes/attributes-microshift.adoc[]
 :context: understanding-persistent-storage-microshift
 
@@ -16,9 +16,6 @@ include::modules/storage-persistent-storage-reclaim.adoc[leveloffset=+2]
 
 include::modules/storage-persistent-storage-pv.adoc[leveloffset=+1]
 
-[role="_additional-resources"]
-.Additional resources
-
 include::modules/storage-persistent-storage-pvc.adoc[leveloffset=+1]
 
 include::modules/storage-persistent-storage-fsGroup.adoc[leveloffset=+1]
diff --git a/modules/dynamic-provisioning-about.adoc b/modules/dynamic-provisioning-about.adoc
@@ -2,6 +2,7 @@
 //
 // * storage/dynamic-provisioning.adoc
 // * post_installation_configuration/storage-configuration.adoc
+// * microshift_storage/dynamic-provisioning-microshift.adoc
 
 :_content-type: CONCEPT
 [id="about_{context}"]
diff --git a/modules/dynamic-provisioning-annotations.adoc b/modules/dynamic-provisioning-annotations.adoc
@@ -2,6 +2,8 @@
 //
 // * storage/dynamic-provisioning.adoc
 // * post_installation_configuration/storage-configuration.adoc
+// * microshift_storage/dynamic-provisioning-microshift.adoc
+
 
 [id="storage-class-annotations_{context}"]
 = Storage class annotations
diff --git a/modules/dynamic-provisioning-change-default-class.adoc b/modules/dynamic-provisioning-change-default-class.adoc
@@ -2,6 +2,7 @@
 //
 // * storage/dynamic-provisioning.adoc
 // * post_installation_configuration/storage-configuration.adoc
+// * microshift_storage/dynamic-provisioning-microshift.adoc
 
 
 [id="change-default-storage-class_{context}"]
diff --git a/modules/dynamic-provisioning-defining-storage-class.adoc b/modules/dynamic-provisioning-defining-storage-class.adoc
@@ -2,6 +2,8 @@
 //
 // * storage/dynamic-provisioning.adoc
 // * post_installation_configuration/storage-configuration.adoc
+// * microshift_storage/dynamic-provisioning-microshift.adoc
+
 
 [id="defining-storage-classes_{context}"]
 = Defining a storage class
diff --git a/modules/dynamic-provisioning-storage-class-definition.adoc b/modules/dynamic-provisioning-storage-class-definition.adoc
@@ -2,6 +2,8 @@
 //
 // * storage/dynamic-provisioning.adoc
 // * post_installation_configuration/storage-configuration.adoc
+// * microshift_storage/dynamic-provisioning-microshift.adoc
+
 
 [id="basic-storage-class-definition_{context}"]
 = Basic StorageClass object definition
diff --git a/modules/persistent-storage-csi-architecture.adoc b/modules/persistent-storage-csi-architecture.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/container_storage_interface/persistent_storage-csi.adoc
+// * microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
+
 
 [id="persistent-storage-csi-architecture_{context}"]
 = CSI Architecture
diff --git a/modules/persistent-storage-csi-driver-daemonset.adoc b/modules/persistent-storage-csi-driver-daemonset.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/container_storage_interface/persistent_storage-csi.adoc
+// * microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
+
 
 [id="csi-driver-daemonset_{context}"]
 = CSI driver daemon set
diff --git a/modules/persistent-storage-csi-dynamic-provisioning.adoc b/modules/persistent-storage-csi-dynamic-provisioning.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/container_storage_interface/persistent-storage-csi.adoc
+// * microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
+
 
 :_content-type: PROCEDURE
 [id="csi-dynamic-provisioning_{context}"]
diff --git a/modules/persistent-storage-csi-external-controllers.adoc b/modules/persistent-storage-csi-external-controllers.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/container_storage_interface/persistent_storage-csi.adoc
+// * microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
+
 
 [id="external-csi-contollers_{context}"]
 = External CSI controllers
diff --git a/modules/persistent-storage-csi-mysql-example.adoc b/modules/persistent-storage-csi-mysql-example.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies
 //
 // * storage/container_storage_interface/persistent_storage-csi.adoc
+// * microshift_storage/container_storage_interface_microshift/microshift-persistent-storage-csi.adoc
+
 
 :_content-type: PROCEDURE
 [id="csi-example-usage_{context}"]
diff --git a/modules/storage-ephemeral-storage-manage.adoc b/modules/storage-ephemeral-storage-manage.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // storage/understanding-persistent-storage.adoc[leveloffset=+1]
+//* microshift_storage/understanding-ephemeral-storage-microshift.adoc
+
 
 [id=storage-ephemeral-storage-manage_{context}]
 = Ephemeral storage management
diff --git a/modules/storage-ephemeral-storage-monitoring.adoc b/modules/storage-ephemeral-storage-monitoring.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // storage/understanding-persistent-storage.adoc[leveloffset=+1]
+//* microshift_storage/understanding-ephemeral-storage-microshift.adoc
+
 
 [id=storage-ephemeral-storage-monitoring_{context}]
 = Monitoring ephemeral storage
diff --git a/modules/storage-ephemeral-storage-overview.adoc b/modules/storage-ephemeral-storage-overview.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // storage/understanding-persistent-storage.adoc[leveloffset=+1]
+//* microshift_storage/understanding-ephemeral-storage-microshift.adoc
+
 
 :_content-type: CONCEPT
 [id=storage-ephemeral-storage-overview_{context}]
diff --git a/modules/storage-ephemeral-storage-types.adoc b/modules/storage-ephemeral-storage-types.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // storage/understanding-persistent-storage.adoc[leveloffset=+1]
+//* microshift_storage/understanding-ephemeral-storage-microshift.adoc
+
 
 [id=storage-ephemeral-storage-types_{context}]
 = Types of ephemeral storage
diff --git a/modules/storage-ephemeral-vols-lifecycle.adoc b/modules/storage-ephemeral-vols-lifecycle.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/generic-ephemeral-vols.adoc
+//* microshift_storage/generic-ephemeral-volumes-microshift.adoc
+
 
 :_content-type: CONCEPT
 [id="generic-ephemeral-vols-lifecycle_{context}"]
diff --git a/modules/storage-ephemeral-vols-overview.adoc b/modules/storage-ephemeral-vols-overview.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/generic-ephemeral-vols.adoc
+//* microshift_storage/generic-ephemeral-volumes-microshift.adoc
+
 
 :_content-type: CONCEPT
 [id="generic-ephemeral-vols-overview_{context}"]
diff --git a/modules/storage-ephemeral-vols-procedure.adoc b/modules/storage-ephemeral-vols-procedure.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/generic-ephemeral-vols.adoc
+//* microshift_storage/generic-ephemeral-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="generic-ephemeral-vols-procedure_{context}"]
diff --git a/modules/storage-ephemeral-vols-pvc-naming.adoc b/modules/storage-ephemeral-vols-pvc-naming.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/generic-ephemeral-vols.adoc
+//* microshift_storage/generic-ephemeral-volumes-microshift.adoc
+
 
 :_content-type: CONCEPT
 [id="generic-ephemeral-vols-pvc-naming_{context}"]
diff --git a/modules/storage-ephemeral-vols-security.adoc b/modules/storage-ephemeral-vols-security.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/generic-ephemeral-vols.adoc
+//* microshift_storage/generic-ephemeral-volumes-microshift.adoc
+
 
 :_content-type: CONCEPT
 [id="generic-ephemeral-security_{context}"]
diff --git a/modules/storage-expanding-add-volume-expansion.adoc b/modules/storage-expanding-add-volume-expansion.adoc
@@ -1,6 +1,7 @@
 // Module included in the following assemblies
 //
 // * storage/expanding-persistent-volumes.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
 
 :_content-type: PROCEDURE
 [id="add-volume-expansion_{context}"]
diff --git a/modules/storage-expanding-csi-volumes.adoc b/modules/storage-expanding-csi-volumes.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies
 //
 // * storage/expanding-persistent-volumes.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="expanding-csi-volumes_{context}"]
@@ -20,14 +22,7 @@ CSI volume expansion does not support the following:
 
 * Dynamic provisioning is used.
 
-ifndef::microshift[]
-* The controlling `StorageClass` object has `allowVolumeExpansion` set to `true` (see xref:../storage/expanding-persistent-volumes.adoc#add-volume-expansion_expanding-persistent-volumes[Enabling volume expansion support]).
-endif::microshift[]
-
-ifdef::microshift[]
-* The controlling `StorageClass` object has `allowVolumeExpansion` set to `true` (see xref:../microshift_storage/expanding-persistent-volumes-microshift.html#add-volume-expansion_expanding-persistent-volumes-microshift[Enabling volume expansion support]).
-endif::[]
-
+* The controlling `StorageClass` object has `allowVolumeExpansion` set to `true`. For more information, see "Enabling volume expansion support." 
 
 .Procedure
 
diff --git a/modules/storage-expanding-filesystem-pvc.adoc b/modules/storage-expanding-filesystem-pvc.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies:
 //
 // * storage/expanding-persistent-volume.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="expanding-pvc-filesystem_{context}"]
diff --git a/modules/storage-expanding-flexvolume.adoc b/modules/storage-expanding-flexvolume.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies
 //
 // * storage/expanding-persistent-volumes.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="expanding-flexvolume_{context}"]
diff --git a/modules/storage-expanding-local-volumes.adoc b/modules/storage-expanding-local-volumes.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies
 //
 // * storage/expanding-persistent-volumes.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="expanding-local-volumes_{context}"]
diff --git a/modules/storage-expanding-recovering-failure.adoc b/modules/storage-expanding-recovering-failure.adoc
@@ -1,6 +1,8 @@
 // Module included in the following assemblies
 //
 // * storage/expanding-persistent-volumes.adoc
+//* microshift_storage/expanding-persistent-volumes-microshift.adoc
+
 
 :_content-type: PROCEDURE
 [id="expanding-recovering-from-failure_{context}"]
diff --git a/modules/storage-persistent-storage-fsGroup.adoc b/modules/storage-persistent-storage-fsGroup.adoc
diff --git a/modules/storage-persistent-storage-lifecycle.adoc b/modules/storage-persistent-storage-lifecycle.adoc
diff --git a/modules/storage-persistent-storage-overview.adoc b/modules/storage-persistent-storage-overview.adoc
diff --git a/modules/storage-persistent-storage-pv.adoc b/modules/storage-persistent-storage-pv.adoc
diff --git a/modules/storage-persistent-storage-pvc.adoc b/modules/storage-persistent-storage-pvc.adoc
diff --git a/modules/storage-persistent-storage-reclaim-manual.adoc b/modules/storage-persistent-storage-reclaim-manual.adoc
diff --git a/modules/storage-persistent-storage-reclaim.adoc b/modules/storage-persistent-storage-reclaim.adoc
diff --git a/storage/expanding-persistent-volumes.adoc b/storage/expanding-persistent-volumes.adoc
diff --git a/storage/index.adoc b/storage/index.adoc
diff --git a/storage/understanding-persistent-storage.adoc b/storage/understanding-persistent-storage.adoc
