summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java4
-rw-r--r--controller-server/src/test/resources/test_runner_services.xml-cd4
2 files changed, 6 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 68e84c7d289..891a696be9c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -692,7 +692,9 @@ public class InternalStepRunner implements StepRunner {
" </filtering>\n" +
" </http>\n" +
"\n" +
- " <nodes count=\"1\" flavor=\"" + flavor + "\" allocated-memory=\"" + jdiscMemoryPercentage + "%\" />\n" +
+ " <nodes count=\"1\" flavor=\"" + flavor + "\">\n" +
+ " <jvm allocated-memory=\"" + jdiscMemoryPercentage + "%\" />\n" +
+ " </nodes>\n" +
" </container>\n" +
"</services>\n";
diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd
index df276f9bbbc..bd49f3be55a 100644
--- a/controller-server/src/test/resources/test_runner_services.xml-cd
+++ b/controller-server/src/test/resources/test_runner_services.xml-cd
@@ -38,6 +38,8 @@
</filtering>
</http>
- <nodes count="1" flavor="d-2-12-75" allocated-memory="17%" />
+ <nodes count="1" flavor="d-2-12-75">
+ <jvm allocated-memory="17%" />
+ </nodes>
</container>
</services>