diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2019-11-15 14:53:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 14:53:25 +0100 |
| commit | 6712756a8fb865230721ce5a14db7f851ef23096 (patch) | |
| tree | 07479bd5a147c08eac97cfdb83845a8e50827ebe /node-repository | |
| parent | 4059e8d8e9ba7825d398a9397f2cd0dbfdb68278 (diff) | |
| parent | 7dafbbd736062e5c58e45e013f50e1b540e334d9 (diff) | |
Merge pull request #11317 from vespa-engine/mortent/dev-noderepo-devhost
Support dev hosts in node repo
Diffstat (limited to 'node-repository')
2 files changed, 6 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java index ca2a5bb271c..00d6282d40f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java @@ -88,6 +88,7 @@ public class InfrastructureVersions { case controllerhost: case proxyhost: case host: + case devhost: break; default: throw new IllegalArgumentException("Target version for type " + nodeType + " is not allowed"); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java index a3714ffe033..302be920950 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java @@ -242,6 +242,11 @@ public class IP { return pool; } + // For dev hosts, allow only ipv4 addresses + if(ipv6AddrCount == 0 && ipv4AddrCount == pool.size()) { + return pool; + } + throw new IllegalArgumentException(String.format("Dual-stacked IP address list must have an " + "equal number of addresses of each version " + "[IPv6 address count = %d, IPv4 address count = %d]", |