Set isRunningLocally to true in services xml for vespa-local

4 files changed, 7 insertions, 3 deletions

diff --git a/node-admin/.gitignore b/node-admin/.gitignore
index 51bc5191fc6..750f12730e3 100644
--- a/node-admin/.gitignore
+++ b/node-admin/.gitignore
@@ -1,3 +1,4 @@
 /dependencies
 /Dockerfile
+include/services.xml
 /**/*.pyc
diff --git a/node-admin/Dockerfile.template b/node-admin/Dockerfile.template
index d747d886fd5..0fdb508777b 100644
--- a/node-admin/Dockerfile.template
+++ b/node-admin/Dockerfile.template
@@ -35,6 +35,6 @@ ADD include/start-config-server.sh $VESPA_HOME/bin/start-config-server.sh
 ADD include/start-services.sh $VESPA_HOME/bin/start-services.sh
 
 # Override what's in the base image with local versions:
-ADD src/main/application/services.xml $VESPA_HOME/conf/node-admin-app/services.xml
+ADD include/services.xml $VESPA_HOME/conf/node-admin-app/services.xml
 ADD target/docker-api-jar-with-dependencies.jar $VESPA_HOME/lib/jars/docker-api-jar-with-dependencies.jar
 ADD target/node-admin-jar-with-dependencies.jar $VESPA_HOME/lib/jars/node-admin-jar-with-dependencies.jar
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index 7370c2960d0..c92889bc8a6 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -14,6 +14,8 @@
       <uri>tcp://localhost:2376</uri>
     </config>
 
-    <config name='vespa.hosted.node.admin.node-admin'/>
+    <config name='vespa.hosted.node.admin.node-admin'>
+      <isRunningLocally>false</isRunningLocally>
+    </config>
   </jdisc>
 </services>
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMaker.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMaker.java
index 4cd45e3c8f2..950d45fc6fe 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMaker.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/SecretAgentScheduleMaker.java
@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  * Helper class to generate and write the secret-agent schedule file.
  *
- * @author valerijf
+ * @author freva
  */
 public class SecretAgentScheduleMaker {
     private final String id;
@@ -38,6 +38,7 @@ public class SecretAgentScheduleMaker {
     }
 
     public void writeTo(Path yamasAgentDirectory) throws IOException {
+        if (! Files.exists(yamasAgentDirectory)) yamasAgentDirectory.toFile().mkdirs();
         Path scheduleFilePath = yamasAgentDirectory.resolve(id + ".yaml");
         Files.write(scheduleFilePath, toString().getBytes());
         scheduleFilePath.toFile().setReadable(true, false); // Give everyone read access to the schedule file