diff options
| author | Jon Bratseth <jonbratseth@yahoo.com> | 2016-11-18 10:35:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 10:35:59 +0100 |
| commit | eb2aaf259f5dad0b662d0519e390699ae0ef4c27 (patch) | |
| tree | a9dde1cb1b13d83981899711e0d349fc729d6f5b /node-repository | |
| parent | 2c96b71359887e9ca1debcfcb69e40470a1e753c (diff) | |
| parent | ea3a6d8be4fb3708612a049bef4ba00a92bfcc42 (diff) | |
Merge pull request #1132 from yahoo/mpolden/known-flavor-for-transient-config-nodes
Use known flavor for transient config nodes
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 3 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 9a7b5c62119..4ee74d4d244 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -143,7 +143,8 @@ public class NodeRepository extends AbstractComponent { // TODO: Revisit this when config servers are added to the repository Arrays.stream(curator.connectionSpec().split(",")) .map(hostPort -> hostPort.split(":")[0]) - .map(host -> createNode(host, host, Optional.empty(), flavors.getFlavorOrThrow("default"), + .map(host -> createNode(host, host, Optional.empty(), + flavors.getFlavorOrThrow("v-4-8-100"), // Must be a flavor that exists in Hosted Vespa NodeType.config)) .forEach(trustedNodes::add); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java index 978151e7275..d76ab2bbb7d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeFlavors.java @@ -21,6 +21,7 @@ public class MockNodeFlavors extends NodeFlavors { b.addFlavor("medium-disk", 6., 12., 56, Flavor.Type.BARE_METAL); b.addFlavor("large", 4., 32., 1600, Flavor.Type.BARE_METAL); b.addFlavor("docker", 0.2, 0.5, 100, Flavor.Type.DOCKER_CONTAINER); + b.addFlavor("v-4-8-100", 4.0, 8.0, 100, Flavor.Type.VIRTUAL_MACHINE); NodeRepositoryConfig.Flavor.Builder largeVariant = b.addFlavor("large-variant", 64, 128, 2000, Flavor.Type.BARE_METAL); b.addReplaces("large", largeVariant); NodeRepositoryConfig.Flavor.Builder expensiveFlavor = b.addFlavor("expensive", 0, 0, 0, Flavor.Type.BARE_METAL); |