From 03b13c98abfd53f8ba8f3e9059c8fbbca1278b5f Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Thu, 2 Nov 2017 11:28:12 +0100
Subject: Include controller config in configserver-app

---
 configserver/src/main/resources/configserver-app/services.xml | 3 +++
 1 file changed, 3 insertions(+)

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' />
-- 
cgit v1.2.3