diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-01-28 19:50:57 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-01-28 20:38:10 +0100 |
| commit | 265556540f89f60374589c985f4afd7d2ec45675 (patch) | |
| tree | aad740265a123eedae3c7d5c1b53ef33a0eedd27 /config-model/src/main/resources | |
| parent | 1925aa19fab95071a4685ccf604665be3d19a957 (diff) | |
Remove legacy <cluster> element from xml schema.
- Has thrown an exception since at least early Vespa 7
Diffstat (limited to 'config-model/src/main/resources')
| -rw-r--r-- | config-model/src/main/resources/schema/legacygenericcluster.rnc | 20 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/services.rnc | 2 |
2 files changed, 0 insertions, 22 deletions
diff --git a/config-model/src/main/resources/schema/legacygenericcluster.rnc b/config-model/src/main/resources/schema/legacygenericcluster.rnc deleted file mode 100644 index b00d4ff097b..00000000000 --- a/config-model/src/main/resources/schema/legacygenericcluster.rnc +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Generic, application-specific service cluster -# -include "legacygenericmodule.rnc" - -LegacyGenericCluster = element cluster { - attribute name { text } & - attribute command { text } & - attribute hostservice { text }? & - attribute num-hosts { text }? & - GenericConfig* & - LegacyGenericModule* & - element node { - service.attlist & - attribute name { text }? & - LegacyGenericModule* & - GenericConfig* - }* -} - diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index c8467898639..3a8ffe30563 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -7,13 +7,11 @@ include "docproc.rnc" include "routing.rnc" include "containercluster.rnc" include "genericcluster.rnc" -include "legacygenericcluster.rnc" start = element services { attribute version { "1.0" }? & attribute application-type { "hosted-infrastructure" }? & element legacy { element v7-geo-positions { xsd:boolean } }? & - LegacyGenericCluster* & GenericCluster* & GenericConfig* & Admin? & |