diff options
2 files changed, 23 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java index f61d4158253..07e4d586a91 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; +import com.google.common.collect.ImmutableList; import com.yahoo.component.Version; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeType; @@ -13,11 +14,11 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.service.monitor.application.ConfigServerApplication; import com.yahoo.vespa.service.monitor.application.ConfigServerHostApplication; import com.yahoo.vespa.service.monitor.application.ControllerApplication; +import com.yahoo.vespa.service.monitor.application.ControllerHostApplication; import com.yahoo.vespa.service.monitor.application.HostedVespaApplication; import com.yahoo.vespa.service.monitor.application.ProxyHostApplication; import java.time.Duration; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.logging.Logger; @@ -33,11 +34,12 @@ import java.util.stream.Collectors; public class InfrastructureProvisioner extends Maintainer { private static final Logger logger = Logger.getLogger(InfrastructureProvisioner.class.getName()); - private static final List<HostedVespaApplication> HOSTED_VESPA_APPLICATIONS = Arrays.asList( + private static final List<HostedVespaApplication> HOSTED_VESPA_APPLICATIONS = ImmutableList.of( ConfigServerApplication.CONFIG_SERVER_APPLICATION, ConfigServerHostApplication.CONFIG_SERVER_HOST_APPLICATION, ProxyHostApplication.PROXY_HOST_APPLICATION, - ControllerApplication.CONTROLLER_APPLICATION); + ControllerApplication.CONTROLLER_APPLICATION, + ControllerHostApplication.CONTROLLER_HOST_APPLICATION); private final Provisioner provisioner; private final InfrastructureVersions infrastructureVersions; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ControllerHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ControllerHostApplication.java new file mode 100644 index 00000000000..8311919d570 --- /dev/null +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ControllerHostApplication.java @@ -0,0 +1,18 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.service.monitor.application; + +import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.NodeType; + +/** + * @author mpolden + */ +public class ControllerHostApplication extends HostedVespaApplication { + + public static final ControllerHostApplication CONTROLLER_HOST_APPLICATION = new ControllerHostApplication(); + + protected ControllerHostApplication() { + super("controller-host", NodeType.controllerhost, ClusterSpec.Type.container, ClusterSpec.Id.from("controller-host")); + } + +} |