diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 3 | ||||
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 03971df7cd7..bdba3549033 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -142,10 +142,10 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri configModelRegistry = new VespaConfigModelRegistry(configModelRegistry); VespaModelBuilder builder = new VespaDomBuilder(); root = builder.getRoot(VespaModel.ROOT_CONFIGID, deployState, this); - this.info = Optional.of(createProvisionInfo()); if (complete) { // create a a completed, frozen model configModelRepo.readConfigModels(deployState, builder, root, configModelRegistry); addServiceClusters(deployState.getApplicationPackage(), builder); + this.info = Optional.of(createProvisionInfo()); // must happen after the two lines above setupRouting(); this.fileDistributor = root.getFileDistributionConfigProducer().getFileDistributor(); getAdmin().addPerHostServices(getHostSystem().getHosts(), deployState.getProperties()); @@ -156,6 +156,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri this.deployState = null; } else { // create a model with no services instantiated and the given file distributor + this.info = Optional.of(createProvisionInfo()); this.fileDistributor = fileDistributor; } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java index 3831f94a77d..b7af5e09f47 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/provision/StaticProvisionerTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals; * @author lulf */ public class StaticProvisionerTest { + @Test public void sameHostsAreProvisioned() throws IOException, SAXException { ApplicationPackage app = FilesApplicationPackage.fromFile(new File("src/test/apps/hosted")); |