diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2017-09-15 13:07:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 13:07:49 +0200 |
| commit | 5ec52913cfe2f748ce2ce282341e48359defe257 (patch) | |
| tree | e7b0fdee13f4486273a74f8ddbad997485ecdb3a | |
| parent | d4f89adb4beaf09c8aecfd5a6ba1e4d459ce119e (diff) | |
| parent | 2f0b6e49407b658acb0e66702d949646a1a73e2c (diff) | |
Merge pull request #3416 from vespa-engine/mpolden/fix-docker-openstack-id
Do not use toString of optional in ID
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 7d5cd85a783..d0149be2747 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -192,8 +192,11 @@ public class NodePrioritizer { String ipAddress = ipAddresses.stream().findFirst().get(); Optional<String> hostname = nameResolver.getHostname(ipAddress); if (!hostname.isPresent()) continue; - Node newNode = Node.createDockerNode("fake-" + hostname, Collections.singleton(ipAddress), - Collections.emptySet(), hostname.get(), Optional.of(node.hostname()), getFlavor(requestedNodes), NodeType.tenant); + Node newNode = Node.createDockerNode("fake-" + hostname.get(), + Collections.singleton(ipAddress), + Collections.emptySet(), hostname.get(), + Optional.of(node.hostname()), getFlavor(requestedNodes), + NodeType.tenant); PrioritizableNode nodePri = toNodePriority(newNode, false, true); if (!nodePri.violatesSpares || isAllocatingForReplacement) { nodes.put(newNode, nodePri); |