Merge with master

3 files changed, 7 insertions, 4 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 8c3e3e28777..b0e1632002b 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
@@ -291,7 +291,8 @@ public class NodeRepository extends AbstractComponent {
             Optional<Node> existing = getNode(node.hostname());
             if (existing.isPresent())
                 throw new IllegalArgumentException("Cannot add " + node.hostname() + ": A node with this name already exists (" +
-                                                           node + ", " + node.history() + ")");
+                                                           existing.get() + ", " + existing.get().history() + "). Node to be added: " +
+                                                           node + ", " + node.history());
         }
         try (Mutex lock = lockUnallocated()) {
             return db.addNodesInState(nodes, Node.State.reserved);
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 f594e9bef9a..e437badf0dc 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
@@ -75,7 +75,7 @@ public class CapacityPolicies {
         if (canFail &&
                 nodeCount == 1 &&
                 Arrays.asList(ClusterSpec.Type.container, ClusterSpec.Type.content).contains(clusterType) &&
-                zone.environment().isProduction() && zone.system() != SystemName.cd)
+                zone.environment().isProduction())
             throw new IllegalArgumentException("Deployments to prod require at least 2 nodes per cluster for redundancy");
         return nodeCount;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
index fd28975bfad..f8067cb8661 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
@@ -13,6 +13,7 @@ import com.yahoo.config.provision.NodeFlavors;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.ProvisionLogger;
 import com.yahoo.config.provision.Provisioner;
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.log.LogLevel;
 import com.yahoo.transaction.NestedTransaction;
@@ -73,8 +74,9 @@ public class NodeRepositoryProvisioner implements Provisioner {
             throw new IllegalArgumentException("Requested " + requestedCapacity.nodeCount() + " nodes in " + wantedGroups + " groups, " +
                                                "which doesn't allow the nodes to be divided evenly into groups");
 
-        log.log(LogLevel.DEBUG, () -> "Received deploy prepare request for " + requestedCapacity + " in " +
-                                      wantedGroups + " groups for application " + application + ", cluster " + cluster);
+        log.log(zone.system() == SystemName.cd ? Level.INFO : LogLevel.DEBUG,
+                () -> "Received deploy prepare request for " + requestedCapacity + " in " +
+                        wantedGroups + " groups for application " + application + ", cluster " + cluster);
 
         int effectiveGroups;
         NodeSpec requestedNodes;