diff options
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java | 6 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Dns.java | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java index 91da7866603..71300ccc11a 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java @@ -51,6 +51,12 @@ public class CloudAccount implements Comparable<CloudAccount> { !equals(zone.cloud().account()); } + /** Returns true if this is an enclave account. */ + public boolean isEnclave(Zone zone) { + return !isUnspecified() && + !equals(zone.cloud().account()); + } + @Override public String toString() { return isUnspecified() ? "unspecified account" : "account '" + account + "' in " + cloudName; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Dns.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Dns.java index 2c2239e4538..af1e7d5cc0f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Dns.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Dns.java @@ -24,14 +24,14 @@ public class Dns { public enum RecordType { FORWARD, PUBLIC_FORWARD, REVERSE } /** Returns the set of DNS record types for a host and its children and the given version (ipv6), host type, etc. */ - public static Set<RecordType> recordTypesFor(IP.Version ipVersion, NodeType hostType, CloudName cloudName, boolean exclave) { + public static Set<RecordType> recordTypesFor(IP.Version ipVersion, NodeType hostType, CloudName cloudName, boolean enclave) { if (cloudName == CloudName.AWS) - return exclave ? + return enclave ? EnumSet.of(RecordType.FORWARD, RecordType.PUBLIC_FORWARD) : EnumSet.of(RecordType.FORWARD, RecordType.PUBLIC_FORWARD, RecordType.REVERSE); if (cloudName == CloudName.GCP) { - if (exclave) { + if (enclave) { return ipVersion.is6() ? EnumSet.of(RecordType.FORWARD, RecordType.PUBLIC_FORWARD) : EnumSet.noneOf(RecordType.class); @@ -49,7 +49,7 @@ public class Dns { public static void verify(String hostname, String ipAddress, NodeType nodeType, NameResolver resolver, CloudAccount cloudAccount, Zone zone) { IP.Version version = IP.Version.fromIpAddress(ipAddress); - Set<RecordType> recordTypes = recordTypesFor(version, nodeType, zone.cloud().name(), cloudAccount.isExclave(zone)); + Set<RecordType> recordTypes = recordTypesFor(version, nodeType, zone.cloud().name(), cloudAccount.isEnclave(zone)); if (recordTypes.contains(RecordType.FORWARD)) { NameResolver.RecordType recordType = version.is6() ? NameResolver.RecordType.AAAA : NameResolver.RecordType.A; |