diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-05-31 14:19:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 14:19:58 +0200 |
| commit | b8dcb781cb7f0ca38fb5e2d2a2093df6d0170c60 (patch) | |
| tree | 061dc3a8cd03be5ed167f40aaf4b4b6cd8ba6d9b /config-model/src | |
| parent | 8d594a3fd688fda3f8c269a82bf7800a10f5634d (diff) | |
| parent | 210b14d6813b023802be81a073f662ff81f3a69a (diff) | |
Merge pull request #9614 from vespa-engine/ogronnesby/rotations-in-deployment-xml
Support for Endpoints in deployment.xml
Diffstat (limited to 'config-model/src')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 15 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 15a4e70e33f..7b15a1c062d 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -10,6 +10,7 @@ start = element deployment { Upgrade? & BlockChange* & Notifications? & + Endpoints? & Test? & Staging? & Prod* @@ -73,3 +74,17 @@ Delay = element delay { Parallel = element parallel { Region* } + +EndpointRegion = element region { + text +} + +Endpoint = element endpoint { + attribute id { xsd:string }? & + attribute container-id { xsd:string } & + EndpointRegion* +} + +Endpoints = element endpoints { + Endpoint+ +} diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index ea65dbec661..0b30067d78a 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -20,4 +20,10 @@ <region active='true'>us-south-2</region> </parallel> </prod> + <endpoints> + <endpoint id="foo" container-id="bar"> + <region>us-east</region> + </endpoint> + <endpoint container-id="bar" /> + </endpoints> </deployment> |