diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-01-08 13:51:45 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-01-08 13:51:45 +0100 |
commit | c856fe16156f0fe9d4d42e90e3af487a1a710f10 (patch) | |
tree | 95071de110b9da996c6882d268d83833eae4e0d4 /node-repository | |
parent | 3f3809ba90a9ebc179dd54a7bcdc9a9f89fc3790 (diff) |
Disable redundancy requirement in CD system
Diffstat (limited to 'node-repository')
3 files changed, 4 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index cb0ee7f3a86..3f392674b20 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.provisioning; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; @@ -60,7 +61,7 @@ public class CapacityPolicies { * @throws IllegalArgumentException if only one node is requested */ private int ensureRedundancy(int nodeCount) { - if (nodeCount == 1) { + if (nodeCount == 1 && zone.system() != SystemName.cd) { throw new IllegalArgumentException("Deployments to prod require at least 2 nodes per cluster for redundancy"); } return nodeCount; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java index 1dce5830540..14c353e68f8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java @@ -464,7 +464,7 @@ public class DynamicDockerProvisioningTest { ApplicationId application = tester.makeApplicationId(); Flavor flavor = tester.nodeRepository().getAvailableFlavors().getFlavorOrThrow("d-3"); tester.prepare(application, ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Version.fromString("6.100")), - 1, 1, flavor.canonicalName()); + 2, 1, flavor.canonicalName()); } private ApplicationId makeApplicationId(String tenant, String appName) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 4cd50f4b279..26e5a9b49b4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -28,6 +28,7 @@ import com.yahoo.vespa.hosted.provision.node.Agent; import com.yahoo.vespa.hosted.provision.node.History; import com.yahoo.vespa.hosted.provision.persistence.NameResolver; import com.yahoo.vespa.hosted.provision.testutils.MockNameResolver; +import org.junit.Ignore; import org.junit.Test; import java.util.Collections; |