From 72cc2930e964eea0969b7f8bcea7fe6b4f0872f0 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Fri, 30 Nov 2018 15:13:32 +0100 Subject: 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. --- .../src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'application-model/src/main') diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java index 0054264d42f..07f2cd604b4 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java @@ -12,6 +12,9 @@ public class ServiceType { // Common service types. public static final ServiceType CONTAINER = new ServiceType("container"); public static final ServiceType SLOBROK = new ServiceType("slobrok"); + public static final ServiceType HOST_ADMIN = new ServiceType("hostadmin"); + public static final ServiceType CONFIG_SERVER = new ServiceType("configserver"); + public static final ServiceType CONTROLLER = new ServiceType("controller"); private final String id; -- cgit v1.2.3