diff options
author | Harald Musum <musum@oath.com> | 2018-04-10 07:53:17 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-04-10 07:53:17 +0200 |
commit | dbdc75146272f6528b8595e90ba5912291328ae6 (patch) | |
tree | ce07c0aa744f2d0a8fe67b495a7a6178af324fd1 /controller-server | |
parent | 2fbee343a890e6541be1814b5ab17411bc731373 (diff) |
Fix logic
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 2 |
1 files changed, 1 insertions, 1 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 9ca9dccdab0..317a01ea374 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 @@ -335,7 +335,7 @@ public class ApplicationController { ConfigServerClient.PreparedApplication preparedApplication; DeploymentId deploymentId = new DeploymentId(applicationId, zone); // TODO: Using deploy() only in CD and in AWS for now - if (controller.system().equals(SystemName.cd) && deploymentId.zoneId().region().value().equals("aws-us-east-1a")) { + if (controller.system().equals(SystemName.cd) || deploymentId.zoneId().region().value().equals("aws-us-east-1a")) { preparedApplication = configServer.deploy(deploymentId, options, cnames, rotationNames, applicationPackage.zippedContent()); } else { preparedApplication = configServer.prepare(deploymentId, options, cnames, rotationNames, applicationPackage.zippedContent()); |