summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerij92@gmail.com>2021-02-18 16:06:22 +0100
committerValerij Fredriksen <valerij92@gmail.com>2021-02-18 16:06:22 +0100
commit7c5b955926932bf2197ce2782a259a457387bfa1 (patch)
tree6f4ec067cfa588072e20415e90932ef6ef762e0e
parent5ef09c7e37133b9352448de3ededb26b01785a35 (diff)
Fix TODO
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 059874f6ae7..e0c890aed8c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -103,11 +103,10 @@ public class NodeRepository extends AbstractComponent {
boolean useCuratorClientCache,
int spareCount,
long nodeCacheSize) {
- // TODO (valerijf): Uncomment when exception for prod.cd-aws is removed
-// if (provisionServiceProvider.getHostProvisioner().isPresent() != zone.getCloud().dynamicProvisioning())
-// throw new IllegalArgumentException(String.format(
-// "dynamicProvisioning property must be 1-to-1 with availability of HostProvisioner, was: dynamicProvisioning=%s, hostProvisioner=%s",
-// zone.getCloud().dynamicProvisioning(), provisionServiceProvider.getHostProvisioner().map(__ -> "present").orElse("empty")));
+ if (provisionServiceProvider.getHostProvisioner().isPresent() != zone.getCloud().dynamicProvisioning())
+ throw new IllegalArgumentException(String.format(
+ "dynamicProvisioning property must be 1-to-1 with availability of HostProvisioner, was: dynamicProvisioning=%s, hostProvisioner=%s",
+ zone.getCloud().dynamicProvisioning(), provisionServiceProvider.getHostProvisioner().map(__ -> "present").orElse("empty")));
this.db = new CuratorDatabaseClient(flavors, curator, clock, zone, useCuratorClientCache, nodeCacheSize);
this.zone = zone;