diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-11-30 15:13:32 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-11-30 15:13:32 +0100 |
commit | 72cc2930e964eea0969b7f8bcea7fe6b4f0872f0 (patch) | |
tree | 403dda89422340efee18b0a796c56bd1fa3ad007 /configserver/src | |
parent | 1b2ccec2d8f5ad05a7a718b62f256b4fd19bda74 (diff) |
Add infrastructure applications to DuperModel
DuperModel is (will be) responsible for both active tenant applications
(through SuperModel) and infrastructure applications. This PR is one step
in that direction:
- All infrastructure applications (config, confighost, controller,
controllerhost, and proxyhost) are owned and managed by DuperModel.
- The InfrastructureProvisioner retrieves all possible infra apps from the
DuperModel (through a reduced API), and "activates" each of them if
target is set and there are any nodes etc.
- The InfrastructureProvisioner then notifies the DuperModel which
apps have been activated, and with which hosts.
- The DuperModel can then build delegate artificially create ApplicationInfo,
which gets translated into the application model, and finally the service
model.
- The resulting service model has NOT_CHECKED for each hostadmin service
instance. This is sufficient for goal 1 of this sprint.
- The config server application currently has health, so that's kept as-is
for now.
- Feature flags have been tried and works and allows 1. to disable adding the
infra apps in the DuperModel, and 2. to enable the infra configserver
instead of the currently created configserver w/health.
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 3dd6e0090c5..92ec8d53022 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -60,11 +60,14 @@ <!-- TODO Vespa 7: Remove scoreboard.xml, replaced by metrics-packets.xml --> <preprocess:include file='hosted-vespa/scoreboard.xml' required='false' /> + <component id="com.yahoo.vespa.flags.FileFlagSource" bundle="flags"/> + <preprocess:include file='hosted-vespa/metrics-packets.xml' required='false' /> <preprocess:include file='controller/container.xml' required='false' /> <component id="com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl" bundle="service-monitor" /> <component id="com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager" bundle="service-monitor" /> <component id="com.yahoo.vespa.service.monitor.internal.ServiceMonitorImpl" bundle="service-monitor" /> + <component id="com.yahoo.vespa.service.monitor.application.DuperModel" bundle="service-monitor" /> <component id="com.yahoo.vespa.orchestrator.ServiceMonitorInstanceLookupService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.status.ZookeeperStatusService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.controller.RetryingClusterControllerClientFactory" bundle="orchestrator" /> |