1 files changed, 24 insertions, 20 deletions
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index 030c42ac8c5..27de4c856e8 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<jdisc id="node-admin" jetty="true" version="1.0">
-  <!-- Please update container test when changing this file -->
-  <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
-  <handler id="com.yahoo.vespa.hosted.node.admin.restapi.RestApiHandler" bundle="node-admin">
-    <binding>http://*/rest/*</binding>
-  </handler>
-  <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.NodeAdminProvider" bundle="node-admin"/>
-  <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
-  <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/>
+<service version="1.0" xmlns:preprocess="properties">
+  <jdisc id="node-admin" jetty="true" version="1.0">
+    <!-- Please update container test when changing this file -->
+    <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
+    <handler id="com.yahoo.vespa.hosted.node.admin.restapi.RestApiHandler" bundle="node-admin">
+      <binding>http://*/rest/*</binding>
+    </handler>
+    <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.NodeAdminProvider" bundle="node-admin"/>
+    <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
+    <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/>
 
-  <config name='vespa.hosted.dockerapi.docker'>
-    <isRunningLocally>false</isRunningLocally>
-  </config>
-  
-  <config name='vespa.hosted.node.admin.node-admin'>
-    <isRunningLocally>false</isRunningLocally>
-    <restartOnDeploy>true</restartOnDeploy>
-  </config>
-  
-  <nodes type="host"/>
-</jdisc>
+    <config name="vespa.hosted.dockerapi.docker">
+      <isRunningLocally>false</isRunningLocally>
+    </config>
+
+    <config name="vespa.hosted.node.admin.node-admin">
+      <isRunningLocally>false</isRunningLocally>
+      <restartOnDeploy>true</restartOnDeploy>
+    </config>
+
+    <nodes type="host"/>
+
+    <preprocess:include file="variant.xml" required="false"/>
+  </jdisc>
+</service>