aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-11-05 10:35:33 +0100
committerGitHub <noreply@github.com>2021-11-05 10:35:33 +0100
commit9c4689e1094bba36a28299f04fbbed1fea5b88ee (patch)
tree44376dd931badd1dfd66b1575b945bbb170829ba /config-model
parent076647d7d136824a5e32ebfbd08a9473098cbe14 (diff)
parentd9e4c7e1543ed96a2ddd29ec8c693366d9b85dfb (diff)
Merge pull request #19880 from vespa-engine/mpolden/application-level-endpoint-syntax
Finalize application-level endpoint syntax
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/resources/schema/deployment.rnc11
1 files changed, 8 insertions, 3 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index ecd43d1ad28..f24750bde8b 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -113,15 +113,20 @@ Delay = element delay {
}
EndpointRegion = element region {
- attribute instance { xsd:string }? &
- attribute weight { xsd:long }? &
+ text
+}
+
+EndpointInstance = element instance {
+ attribute weight { xsd:long } &
text
}
Endpoint = element endpoint {
attribute id { xsd:string }? &
attribute container-id { xsd:string } &
- EndpointRegion*
+ attribute region { xsd:string }? &
+ EndpointRegion* &
+ EndpointInstance*
}
Endpoints = element endpoints {