diff options
3 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index 59a48ad3c7e..df449ca017b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -277,6 +277,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { .tenantSecretStores(session.getTenantSecretStores()); session.getDockerImageRepository().ifPresent(params::dockerImageRepository); session.getAthenzDomain().ifPresent(params::athenzDomain); + session.getCloudAccount().ifPresent(params::cloudAccount); return params.build(); }); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index e146f0de187..988d13b1978 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -325,6 +325,8 @@ public class SessionZooKeeperClient { if (cloudAccount.isPresent()) { byte[] data = uncheck(() -> SlimeUtils.toJsonBytes(CloudAccountSerializer.toSlime(cloudAccount.get()))); curator.set(cloudAccountPath(), data); + } else { + curator.delete(cloudAccountPath()); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java index a9e7ded66e6..dcf39cd5ec4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java @@ -137,7 +137,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer { if (host.state() != mutex.node().state()) return; host = mutex.node(); // First mark the host as wantToDeprovision so that if hostProvisioner fails, this host - // * wont get new nodes allocated to it + // * won't get new nodes allocated to it // * will be selected as excess on next iteration of this maintainer nodeRepository().nodes().deprovision(host.hostname(), Agent.DynamicProvisioningMaintainer, nodeRepository().clock().instant()); hostProvisioner.deprovision(host); |