diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2023-05-15 12:54:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 12:54:53 +0200 |
| commit | 5e18b160b3dd2cd852441ea89d0c4efbb6b14232 (patch) | |
| tree | 11eb695746ce567fab09cd6c315673188c096d47 | |
| parent | c2359b5144e5547e52b020c81c07581a234bda7e (diff) | |
| parent | b3a9b8a2f5dac2d1a3360efa034062ee70cae677 (diff) | |
Merge pull request #27108 from vespa-engine/freva/check-cloud
Allow enclave based on cloud name
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 17010fe3fd3..0b56d811712 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -27,7 +27,7 @@ public class Zone { .name(CloudName.from(configserverConfig.cloud())) .dynamicProvisioning(cloudConfig.dynamicProvisioning()) .allowHostSharing(cloudConfig.allowHostSharing()) - .allowEnclave(cloudConfig.dynamicProvisioning()) + .allowEnclave(configserverConfig.cloud().equals("aws") || configserverConfig.cloud().equals("gcp")) .requireAccessControl(cloudConfig.requireAccessControl()) .account(CloudAccount.from(cloudConfig.account())) .build(), |