summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-28 23:37:02 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-28 23:37:02 +0100
commitebb5d4f5f5d1350e0bca008b1a669b52f6d02b0c (patch)
tree070ed23b56076c82baa11baa2554ebd410671dab /config-model
parent70c38388648f88aa060d8c7b71dd113867fb3ebe (diff)
Correct the xml schema by moving the environment-variables outside the obscure else construct.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/resources/schema/containercluster.rnc8
1 files changed, 3 insertions, 5 deletions
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 2f40a090678..76137fd6263 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -212,9 +212,11 @@ NodesOfContainerCluster = element nodes {
attribute jvm-options { text }? &
attribute jvm-gc-options { text }? &
attribute preload { text }? &
- attribute environment-vars { text }? &
attribute allocated-memory { text }? &
attribute cpu-socket-affinity { xsd:boolean }? &
+ element environment-variables {
+ anyElement +
+ } ? &
(
(
attribute of { xsd:string } &
@@ -231,10 +233,6 @@ NodesOfContainerCluster = element nodes {
attribute docker-image { xsd:string }?
)
|
- element environment-variables {
- anyElement +
- }
- |
element node {
attribute hostalias { xsd:NCName } &
attribute cpu-socket { xsd:positiveInteger }? &