diff options
author | Harald Musum <musum@oath.com> | 2018-04-25 11:28:44 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-04-25 11:28:44 +0200 |
commit | f76d6a73729ac8fe6af545495308cc6241c4d29e (patch) | |
tree | b13d55e8fb796e0d241978a0b1f86f342c5d012e /standalone-container | |
parent | 2537ef4fed056fefd144b2e56883a7f8fff25e27 (diff) |
Move flags for rpc, messagebus and http enabled to container cluster
Diffstat (limited to 'standalone-container')
-rw-r--r-- | standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala index 50ad6c73daa..5271cd400d4 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala @@ -172,7 +172,6 @@ object StandaloneContainerApplication { deployState.getDocumentModel, deployState.getProperties.vespaVersion(), deployState.getProperties.applicationId()) - val spec = containerRootElement(applicationPackage) val containerModel = newContainerModelBuilder(networkingOption).build(deployState, configModelRepo, vespaRoot, spec) @@ -180,14 +179,10 @@ object StandaloneContainerApplication { DeprecationSuppressor.initializeContainerModel(containerModel, configModelRepo) val container = first(containerModel.getCluster().getContainers) - // TODO: If we can do the mutations below on the builder, we can separate out model finalization from the - // VespaModel constructor, such that the above and below code to finalize the container can be + // TODO: Separate out model finalization from the VespaModel constructor, + // such that the above and below code to finalize the container can be // replaced by root.finalize(); - // Always disable rpc server for standalone container. This server will soon be removed anyway. - container.setRpcServerEnabled(false) - container.setHttpServerEnabled(networkingOption == Networking.enable) - initializeContainer(container, spec) root.freezeModelTopology() |