aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-06-21 16:06:45 +0200
committerHarald Musum <musum@yahoo-inc.com>2017-06-21 16:06:45 +0200
commit83836d0899635fd01ec8671a8c830ddcefac8705 (patch)
treeb0aee956ea1575d09dcbb04b324fc4f73672bc84 /config-model
parenta69299eb06d514e77394248d5dbdcfc52a3f09d6 (diff)
Allow minSlobroksPerCluster in v3 and v4 too
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/resources/schema/admin.rnc2
-rw-r--r--config-model/src/test/schema-test-files/services-hosted.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc
index 311b2567755..e2f15fc51e4 100644
--- a/config-model/src/main/resources/schema/admin.rnc
+++ b/config-model/src/main/resources/schema/admin.rnc
@@ -19,12 +19,14 @@ AdminV2 =
AdminV3 =
element admin {
attribute version { "3.0" } &
+ element minSlobroksPerCluster { xsd:positiveInteger }? &
Nodes
}
AdminV4 =
element admin {
attribute version { "4.0" } &
+ element minSlobroksPerCluster { xsd:positiveInteger }? &
AdminV4Slobroks? &
AdminV4LogServers? &
AdminYamas? &
diff --git a/config-model/src/test/schema-test-files/services-hosted.xml b/config-model/src/test/schema-test-files/services-hosted.xml
index 90894aa253b..aee208088b7 100644
--- a/config-model/src/test/schema-test-files/services-hosted.xml
+++ b/config-model/src/test/schema-test-files/services-hosted.xml
@@ -4,6 +4,7 @@
<admin version="3.0">
<nodes count="3" flavor="small"/>
+ <minSlobroksPerCluster>1</minSlobroksPerCluster>
</admin>
<jdisc id="container1" version="1.0">