2 files changed, 8 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 0eca30ddeec..7c718518129 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -10,6 +10,7 @@ import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -403,9 +404,6 @@ public class ApplicationController {
                     application = storeWithUpdatedConfig(application, applicationPackage);
                 }
 
-                if (zone.environment().isProduction()) // Assign and register endpoints
-                    application = withRotation(applicationPackage.deploymentSpec(), application, instance);
-
                 endpoints = registerEndpointsInDns(applicationPackage.deploymentSpec(), application.get().require(instanceId.instance()), zone);
             } // Release application lock while doing the deployment, which is a lengthy task.
 
@@ -481,6 +479,11 @@ public class ApplicationController {
                 application = application.with(name, instance -> withoutUnreferencedDeploymentJobs(deploymentSpec, instance));
             }
         }
+
+        for (InstanceName instance : declaredInstances)
+            if (applicationPackage.deploymentSpec().requireInstance(instance).deploysTo(Environment.prod))
+                application = withRotation(applicationPackage.deploymentSpec(), application, instance);
+
         store(application);
         return application;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
index 246dd236b5a..dcadd992b32 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
@@ -84,14 +84,13 @@ public class Controller extends AbstractComponent implements ApplicationIdSource
                       MavenRepository mavenRepository,
                       ServiceRegistry serviceRegistry) {
         this(curator, rotationsConfig, zoneRegistry,
-             Clock.systemUTC(), accessControl,
+             accessControl,
              com.yahoo.net.HostName::getLocalhost, flagSource,
              mavenRepository, serviceRegistry);
     }
 
     public Controller(CuratorDb curator, RotationsConfig rotationsConfig,
                       ZoneRegistry zoneRegistry,
-                      Clock clock,
                       AccessControl accessControl,
                       Supplier<String> hostnameSupplier,
                       FlagSource flagSource, MavenRepository mavenRepository,
@@ -101,7 +100,7 @@ public class Controller extends AbstractComponent implements ApplicationIdSource
         this.curator = Objects.requireNonNull(curator, "Curator cannot be null");
         this.zoneRegistry = Objects.requireNonNull(zoneRegistry, "ZoneRegistry cannot be null");
         this.serviceRegistry = Objects.requireNonNull(serviceRegistry, "ServiceRegistry cannot be null");
-        this.clock = Objects.requireNonNull(clock, "Clock cannot be null");
+        this.clock = Objects.requireNonNull(serviceRegistry.clock(), "Clock cannot be null");
         this.flagSource = Objects.requireNonNull(flagSource, "FlagSource cannot be null");
         this.mavenRepository = Objects.requireNonNull(mavenRepository, "MavenRepository cannot be null");