From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 16:44:46 +0000 (+0200)
Subject: schema: storagepool: Allow interleaving of per-pool custom namespace elements
X-Git-Tag: v8.10.0-rc1~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=663b36019bf5237e381a4716bc3f0cfc72524e65;p=thirdparty%2Flibvirt.git

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 d81ead532a..63a8b75fd8 100644
--- 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">