diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-11-02 12:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 12:05:11 +0100 |
| commit | 040286c3e04e0bdafb40aebdcdb1c6ae78b743e6 (patch) | |
| tree | eb3f7547e5337778ccd62227d6313347818d7947 | |
| parent | fb709f8769433ce914e6114cee4baaacabce6bb9 (diff) | |
| parent | 03b13c98abfd53f8ba8f3e9059c8fbbca1278b5f (diff) | |
Merge pull request #3975 from vespa-engine/mpolden/include-controller-config
Include controller config in configserver-app
| -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 e158ac28424..bf147b167e9 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0" xmlns:preprocess="properties"> + <preprocess:include file='controller/admin.xml' required='false' /> <jdisc id="configserver" jetty="true" version="1.0"> <config name="container.handler.threadpool"> <maxthreads>100</maxthreads> <!-- Reduced thread count to minimize memory consumption --> @@ -43,6 +44,7 @@ <preprocess:include file='config-models.xml' required='false' /> <preprocess:include file='node-repository.xml' required='false' /> <preprocess:include file='hosted-vespa/routing-status.xml' required='false' /> + <preprocess:include file='controller/container.xml' required='false' /> <component id="com.yahoo.vespa.service.monitor.internal.SlobrokMonitorManagerImpl" bundle="service-monitor" /> <component id="com.yahoo.vespa.service.monitor.internal.ServiceMonitorImpl" bundle="service-monitor" /> <component id="com.yahoo.vespa.orchestrator.ServiceMonitorInstanceLookupService" bundle="orchestrator" /> @@ -134,6 +136,7 @@ <http> <server port="19071" id="configserver" /> <preprocess:include file='hosted-vespa/http-server.xml' required='false' /> + <preprocess:include file='controller/http.xml' required='false' /> </http> <preprocess:include file='athenz-identity-provider.xml' required='false' /> |