schema: storagepool: Allow interleaving of per-pool custom namespace elements

The custom namespace parameters for 'rbd' and 'netfs' pool types were
not included in the interleave statement.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/schemas/storagepool.rng b/src/conf/schemas/storagepool.rng
index d81ead532ae67b3001b4e10a1b2492d01e769cc4..63a8b75fd84298874e999dcfa7e97c50541f6a18 100644 (file)
--- a/src/conf/schemas/storagepool.rng
+++ b/src/conf/schemas/storagepool.rng
@@ -69,10 +69,10 @@
       <ref name="features"/>
       <ref name="sourcenetfs"/>
       <ref name="target"/>
+      <optional>
+        <ref name="fs_mount_opts"/>
+      </optional>
     </interleave>
-    <optional>
-      <ref name="fs_mount_opts"/>
-    </optional>
   </define>
 
   <define name="poollogical">
@@ -166,10 +166,10 @@
       <ref name="features"/>
       <ref name="sourcerbd"/>
       <ref name="refresh"/>
+      <optional>
+        <ref name="rbd_config_opts"/>
+      </optional>
     </interleave>
-    <optional>
-      <ref name="rbd_config_opts"/>
-    </optional>
   </define>
 
   <define name="poolsheepdog">