diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2018-08-30 09:58:25 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@oath.com> | 2018-08-30 09:58:25 +0200 |
| commit | 4bf4a4090d79a2d3326ac95a301cd6561b8418e0 (patch) | |
| tree | e8145c22e8f2d5390170944c4db3344193e54eb1 | |
| parent | 114f42cb0ea790bc758b779f8c747184b68bfe2b (diff) | |
Always consider on-prem node-admin to be up
| -rw-r--r-- | configdefinitions/src/vespa/configserver.def | 2 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index 70df8ce5164..c90709bf4dd 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -52,7 +52,7 @@ athenzDnsSuffix string default="" ztsUrl string default="" # Node admin -nodeAdminInContainer bool default=true +nodeAdminInContainer bool default=false # Maintainers maintainerIntervalMinutes int default=60 diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java index 71b0b125e0f..08cf8e7dc20 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java @@ -252,7 +252,9 @@ public class NodeFailerTest { @Test public void docker_host_failed_without_config_requests() { - NodeFailTester tester = NodeFailTester.withTwoApplications(); + NodeFailTester tester = NodeFailTester.withTwoApplications( + new ConfigserverConfig(new ConfigserverConfig.Builder().nodeAdminInContainer(true)) + ); // For a day all nodes work so nothing happens for (int minutes = 0, interval = 30; minutes < 24 * 60; minutes += interval) { |