36 files changed, 36 insertions, 70 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 0673e803057..ad870ff6a87 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -4,73 +4,39 @@ vespa_add_library(configdefinitions
     INSTALL lib64
     DEPENDS
 )
-vespa_generate_config(configdefinitions application-id.def)
-install_config_definition(application-id.def cloud.config.application-id.def)
-vespa_generate_config(configdefinitions athenz-provider-service.def)
-install_config_definition(athenz-provider-service.def vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
-vespa_generate_config(configdefinitions attributes.def)
-install_config_definition(attributes.def vespa.config.search.attributes.def)
-vespa_generate_config(configdefinitions cluster-info.def)
-install_config_definition(cluster-info.def cloud.config.cluster-info.def)
-vespa_generate_config(configdefinitions cluster-list.def)
-install_config_definition(cluster-list.def cloud.config.cluster-list.def)
-vespa_generate_config(configdefinitions configserver.def)
-install_config_definition(configserver.def cloud.config.configserver.def)
-vespa_generate_config(configdefinitions dispatch.def)
-install_config_definition(dispatch.def vespa.config.search.dispatch.def)
-vespa_generate_config(configdefinitions filereferences.def)
-install_config_definition(filereferences.def cloud.config.filedistribution.filereferences.def)
-vespa_generate_config(configdefinitions fleetcontroller.def)
-install_config_definition(fleetcontroller.def vespa.config.content.fleetcontroller.def)
-vespa_generate_config(configdefinitions ilscripts.def)
-install_config_definition(ilscripts.def vespa.configdefinition.ilscripts.def)
-vespa_generate_config(configdefinitions imported-fields.def)
-install_config_definition(imported-fields.def vespa.config.search.imported-fields.def)
-vespa_generate_config(configdefinitions indexschema.def)
-install_config_definition(indexschema.def vespa.config.search.indexschema.def)
-vespa_generate_config(configdefinitions lb-services.def)
-install_config_definition(lb-services.def cloud.config.lb-services.def)
-vespa_generate_config(configdefinitions load-type.def)
-install_config_definition(load-type.def vespa.config.content.load-type.def)
-vespa_generate_config(configdefinitions logforwarder.def)
-install_config_definition(logforwarder.def cloud.config.logforwarder.def)
-vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
-install_config_definition(messagetyperouteselectorpolicy.def vespa.config.content.messagetyperouteselectorpolicy.def)
-vespa_generate_config(configdefinitions model.def)
-install_config_definition(model.def cloud.config.model.def)
-vespa_generate_config(configdefinitions orchestrator.def)
-install_config_definition(orchestrator.def vespa.orchestrator.config.orchestrator.def)
-vespa_generate_config(configdefinitions persistence.def)
-install_config_definition(persistence.def vespa.config.content.persistence.def)
-vespa_generate_config(configdefinitions rank-profiles.def)
-install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def)
-vespa_generate_config(configdefinitions routing-provider.def)
-install_config_definition(routing-provider.def cloud.config.routing-provider.def)
-vespa_generate_config(configdefinitions sentinel.def)
-install_config_definition(sentinel.def cloud.config.sentinel.def)
-vespa_generate_config(configdefinitions slobroks.def)
-install_config_definition(slobroks.def cloud.config.slobroks.def)
-vespa_generate_config(configdefinitions specialtokens.def)
-install_config_definition(specialtokens.def vespa.configdefinition.specialtokens.def)
-vespa_generate_config(configdefinitions stor-distribution.def)
-install_config_definition(stor-distribution.def vespa.config.content.stor-distribution.def)
-vespa_generate_config(configdefinitions stor-filestor.def)
-install_config_definition(stor-filestor.def vespa.config.content.stor-filestor.def)
-vespa_generate_config(configdefinitions summary.def)
-install_config_definition(summary.def vespa.config.search.summary.def)
-vespa_generate_config(configdefinitions summarymap.def)
-install_config_definition(summarymap.def vespa.config.search.summarymap.def)
-vespa_generate_config(configdefinitions upgrading.def)
-install_config_definition(upgrading.def vespa.config.content.upgrading.def)
-vespa_generate_config(configdefinitions ymon.def)
-install_config_definition(ymon.def cloud.config.ymon.def)
-vespa_generate_config(configdefinitions zookeeper-server.def)
-install_config_definition(zookeeper-server.def cloud.config.zookeeper-server.def)
-vespa_generate_config(configdefinitions zookeepers.def)
-install_config_definition(zookeepers.def cloud.config.zookeepers.def)
-vespa_generate_config(configdefinitions bucketspaces.def)
-install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def)
-vespa_generate_config(configdefinitions all-clusters-bucket-spaces.def)
-install_config_definition(all-clusters-bucket-spaces.def vespa.config.content.all-clusters-bucket-spaces.def)
-vespa_generate_config(configdefinitions stateserver.def)
-install_config_definition(stateserver.def vespa.config.core.stateserver.def)
+vespa_generate_config(configdefinitions cloud.config.application-id.def)
+vespa_generate_config(configdefinitions vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
+vespa_generate_config(configdefinitions vespa.config.search.attributes.def)
+vespa_generate_config(configdefinitions cloud.config.cluster-info.def)
+vespa_generate_config(configdefinitions cloud.config.cluster-list.def)
+vespa_generate_config(configdefinitions cloud.config.configserver.def)
+vespa_generate_config(configdefinitions vespa.config.search.dispatch.def)
+vespa_generate_config(configdefinitions cloud.config.filedistribution.filereferences.def)
+vespa_generate_config(configdefinitions vespa.config.content.fleetcontroller.def)
+vespa_generate_config(configdefinitions vespa.configdefinition.ilscripts.def)
+vespa_generate_config(configdefinitions vespa.config.search.imported-fields.def)
+vespa_generate_config(configdefinitions vespa.config.search.indexschema.def)
+vespa_generate_config(configdefinitions cloud.config.lb-services.def)
+vespa_generate_config(configdefinitions vespa.config.content.load-type.def)
+vespa_generate_config(configdefinitions cloud.config.logforwarder.def)
+vespa_generate_config(configdefinitions vespa.config.content.messagetyperouteselectorpolicy.def)
+vespa_generate_config(configdefinitions cloud.config.model.def)
+vespa_generate_config(configdefinitions vespa.orchestrator.config.orchestrator.def)
+vespa_generate_config(configdefinitions vespa.config.content.persistence.def)
+vespa_generate_config(configdefinitions vespa.config.search.rank-profiles.def)
+vespa_generate_config(configdefinitions cloud.config.routing-provider.def)
+vespa_generate_config(configdefinitions cloud.config.sentinel.def)
+vespa_generate_config(configdefinitions cloud.config.slobroks.def)
+vespa_generate_config(configdefinitions vespa.configdefinition.specialtokens.def)
+vespa_generate_config(configdefinitions vespa.config.content.stor-distribution.def)
+vespa_generate_config(configdefinitions vespa.config.content.stor-filestor.def)
+vespa_generate_config(configdefinitions vespa.config.search.summary.def)
+vespa_generate_config(configdefinitions vespa.config.search.summarymap.def)
+vespa_generate_config(configdefinitions vespa.config.content.upgrading.def)
+vespa_generate_config(configdefinitions cloud.config.ymon.def)
+vespa_generate_config(configdefinitions cloud.config.zookeeper-server.def)
+vespa_generate_config(configdefinitions cloud.config.zookeepers.def)
+vespa_generate_config(configdefinitions vespa.config.content.core.bucketspaces.def)
+vespa_generate_config(configdefinitions vespa.config.content.all-clusters-bucket-spaces.def)
+vespa_generate_config(configdefinitions vespa.config.core.stateserver.def)
+install_config_definitions(src/vespa)
diff --git a/configdefinitions/src/vespa/application-id.def b/configdefinitions/src/vespa/cloud.config.application-id.def
index 72f69f48519..72f69f48519 100644
--- a/configdefinitions/src/vespa/application-id.def
+++ b/configdefinitions/src/vespa/cloud.config.application-id.def
diff --git a/configdefinitions/src/vespa/cluster-info.def b/configdefinitions/src/vespa/cloud.config.cluster-info.def
index f5e94ad61b3..f5e94ad61b3 100644
--- a/configdefinitions/src/vespa/cluster-info.def
+++ b/configdefinitions/src/vespa/cloud.config.cluster-info.def
diff --git a/configdefinitions/src/vespa/cluster-list.def b/configdefinitions/src/vespa/cloud.config.cluster-list.def
index ad6f9715eb9..ad6f9715eb9 100644
--- a/configdefinitions/src/vespa/cluster-list.def
+++ b/configdefinitions/src/vespa/cloud.config.cluster-list.def
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/cloud.config.configserver.def
index 7405f5f2d05..7405f5f2d05 100644
--- a/configdefinitions/src/vespa/configserver.def
+++ b/configdefinitions/src/vespa/cloud.config.configserver.def
diff --git a/configdefinitions/src/vespa/filereferences.def b/configdefinitions/src/vespa/cloud.config.filedistribution.filereferences.def
index 03e071959ce..03e071959ce 100644
--- a/configdefinitions/src/vespa/filereferences.def
+++ b/configdefinitions/src/vespa/cloud.config.filedistribution.filereferences.def
diff --git a/configdefinitions/src/vespa/lb-services.def b/configdefinitions/src/vespa/cloud.config.lb-services.def
index 33c568061fe..33c568061fe 100644
--- a/configdefinitions/src/vespa/lb-services.def
+++ b/configdefinitions/src/vespa/cloud.config.lb-services.def
diff --git a/configdefinitions/src/vespa/logforwarder.def b/configdefinitions/src/vespa/cloud.config.logforwarder.def
index ab56589298f..ab56589298f 100644
--- a/configdefinitions/src/vespa/logforwarder.def
+++ b/configdefinitions/src/vespa/cloud.config.logforwarder.def
diff --git a/configdefinitions/src/vespa/model.def b/configdefinitions/src/vespa/cloud.config.model.def
index 59c04cee143..59c04cee143 100644
--- a/configdefinitions/src/vespa/model.def
+++ b/configdefinitions/src/vespa/cloud.config.model.def
diff --git a/configdefinitions/src/vespa/routing-provider.def b/configdefinitions/src/vespa/cloud.config.routing-provider.def
index eedf4f3c86f..eedf4f3c86f 100755
--- a/configdefinitions/src/vespa/routing-provider.def
+++ b/configdefinitions/src/vespa/cloud.config.routing-provider.def
diff --git a/configdefinitions/src/vespa/sentinel.def b/configdefinitions/src/vespa/cloud.config.sentinel.def
index d318a55cccf..d318a55cccf 100644
--- a/configdefinitions/src/vespa/sentinel.def
+++ b/configdefinitions/src/vespa/cloud.config.sentinel.def
diff --git a/configdefinitions/src/vespa/slobroks.def b/configdefinitions/src/vespa/cloud.config.slobroks.def
index b4e5536d2df..b4e5536d2df 100644
--- a/configdefinitions/src/vespa/slobroks.def
+++ b/configdefinitions/src/vespa/cloud.config.slobroks.def
diff --git a/configdefinitions/src/vespa/ymon.def b/configdefinitions/src/vespa/cloud.config.ymon.def
index 2296248bf8b..2296248bf8b 100644
--- a/configdefinitions/src/vespa/ymon.def
+++ b/configdefinitions/src/vespa/cloud.config.ymon.def
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/cloud.config.zookeeper-server.def
index 483e772b818..483e772b818 100644
--- a/configdefinitions/src/vespa/zookeeper-server.def
+++ b/configdefinitions/src/vespa/cloud.config.zookeeper-server.def
diff --git a/configdefinitions/src/vespa/zookeepers.def b/configdefinitions/src/vespa/cloud.config.zookeepers.def
index d12bdd334ca..d12bdd334ca 100644
--- a/configdefinitions/src/vespa/zookeepers.def
+++ b/configdefinitions/src/vespa/cloud.config.zookeepers.def
diff --git a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def b/configdefinitions/src/vespa/vespa.config.content.all-clusters-bucket-spaces.def
index 7676bc2a03f..7676bc2a03f 100644
--- a/configdefinitions/src/vespa/all-clusters-bucket-spaces.def
+++ b/configdefinitions/src/vespa/vespa.config.content.all-clusters-bucket-spaces.def
diff --git a/configdefinitions/src/vespa/bucketspaces.def b/configdefinitions/src/vespa/vespa.config.content.core.bucketspaces.def
index c9468850018..c9468850018 100644
--- a/configdefinitions/src/vespa/bucketspaces.def
+++ b/configdefinitions/src/vespa/vespa.config.content.core.bucketspaces.def
diff --git a/configdefinitions/src/vespa/fleetcontroller.def b/configdefinitions/src/vespa/vespa.config.content.fleetcontroller.def
index 96b43a15c5e..96b43a15c5e 100644
--- a/configdefinitions/src/vespa/fleetcontroller.def
+++ b/configdefinitions/src/vespa/vespa.config.content.fleetcontroller.def
diff --git a/configdefinitions/src/vespa/load-type.def b/configdefinitions/src/vespa/vespa.config.content.load-type.def
index 2e3f65cfbba..2e3f65cfbba 100644
--- a/configdefinitions/src/vespa/load-type.def
+++ b/configdefinitions/src/vespa/vespa.config.content.load-type.def
diff --git a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def b/configdefinitions/src/vespa/vespa.config.content.messagetyperouteselectorpolicy.def
index 7fbd6e45bd7..7fbd6e45bd7 100644
--- a/configdefinitions/src/vespa/messagetyperouteselectorpolicy.def
+++ b/configdefinitions/src/vespa/vespa.config.content.messagetyperouteselectorpolicy.def
diff --git a/configdefinitions/src/vespa/persistence.def b/configdefinitions/src/vespa/vespa.config.content.persistence.def
index b2709dedc57..b2709dedc57 100644
--- a/configdefinitions/src/vespa/persistence.def
+++ b/configdefinitions/src/vespa/vespa.config.content.persistence.def
diff --git a/configdefinitions/src/vespa/stor-distribution.def b/configdefinitions/src/vespa/vespa.config.content.stor-distribution.def
index 518626228c1..518626228c1 100644
--- a/configdefinitions/src/vespa/stor-distribution.def
+++ b/configdefinitions/src/vespa/vespa.config.content.stor-distribution.def
diff --git a/configdefinitions/src/vespa/stor-filestor.def b/configdefinitions/src/vespa/vespa.config.content.stor-filestor.def
index 8ac372c0575..8ac372c0575 100644
--- a/configdefinitions/src/vespa/stor-filestor.def
+++ b/configdefinitions/src/vespa/vespa.config.content.stor-filestor.def
diff --git a/configdefinitions/src/vespa/upgrading.def b/configdefinitions/src/vespa/vespa.config.content.upgrading.def
index 3f610c9352d..3f610c9352d 100644
--- a/configdefinitions/src/vespa/upgrading.def
+++ b/configdefinitions/src/vespa/vespa.config.content.upgrading.def
diff --git a/configdefinitions/src/vespa/stateserver.def b/configdefinitions/src/vespa/vespa.config.core.stateserver.def
index a25844fa148..a25844fa148 100644
--- a/configdefinitions/src/vespa/stateserver.def
+++ b/configdefinitions/src/vespa/vespa.config.core.stateserver.def
diff --git a/configdefinitions/src/vespa/attributes.def b/configdefinitions/src/vespa/vespa.config.search.attributes.def
index 6c69d71fdf6..6c69d71fdf6 100644
--- a/configdefinitions/src/vespa/attributes.def
+++ b/configdefinitions/src/vespa/vespa.config.search.attributes.def
diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/vespa.config.search.dispatch.def
index aa40c317d75..aa40c317d75 100644
--- a/configdefinitions/src/vespa/dispatch.def
+++ b/configdefinitions/src/vespa/vespa.config.search.dispatch.def
diff --git a/configdefinitions/src/vespa/imported-fields.def b/configdefinitions/src/vespa/vespa.config.search.imported-fields.def
index 0947ff63e2a..0947ff63e2a 100644
--- a/configdefinitions/src/vespa/imported-fields.def
+++ b/configdefinitions/src/vespa/vespa.config.search.imported-fields.def
diff --git a/configdefinitions/src/vespa/indexschema.def b/configdefinitions/src/vespa/vespa.config.search.indexschema.def
index 245570ef7b5..245570ef7b5 100644
--- a/configdefinitions/src/vespa/indexschema.def
+++ b/configdefinitions/src/vespa/vespa.config.search.indexschema.def
diff --git a/configdefinitions/src/vespa/rank-profiles.def b/configdefinitions/src/vespa/vespa.config.search.rank-profiles.def
index 525930c990b..525930c990b 100644
--- a/configdefinitions/src/vespa/rank-profiles.def
+++ b/configdefinitions/src/vespa/vespa.config.search.rank-profiles.def
diff --git a/configdefinitions/src/vespa/summary.def b/configdefinitions/src/vespa/vespa.config.search.summary.def
index 20ca6b10450..20ca6b10450 100644
--- a/configdefinitions/src/vespa/summary.def
+++ b/configdefinitions/src/vespa/vespa.config.search.summary.def
diff --git a/configdefinitions/src/vespa/summarymap.def b/configdefinitions/src/vespa/vespa.config.search.summarymap.def
index a994309e207..a994309e207 100644
--- a/configdefinitions/src/vespa/summarymap.def
+++ b/configdefinitions/src/vespa/vespa.config.search.summarymap.def
diff --git a/configdefinitions/src/vespa/ilscripts.def b/configdefinitions/src/vespa/vespa.configdefinition.ilscripts.def
index 901e87dbd04..901e87dbd04 100644
--- a/configdefinitions/src/vespa/ilscripts.def
+++ b/configdefinitions/src/vespa/vespa.configdefinition.ilscripts.def
diff --git a/configdefinitions/src/vespa/specialtokens.def b/configdefinitions/src/vespa/vespa.configdefinition.specialtokens.def
index 1e6addcf358..1e6addcf358 100644
--- a/configdefinitions/src/vespa/specialtokens.def
+++ b/configdefinitions/src/vespa/vespa.configdefinition.specialtokens.def
diff --git a/configdefinitions/src/vespa/athenz-provider-service.def b/configdefinitions/src/vespa/vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def
index bd929cb17d4..bd929cb17d4 100644
--- a/configdefinitions/src/vespa/athenz-provider-service.def
+++ b/configdefinitions/src/vespa/vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def
diff --git a/configdefinitions/src/vespa/orchestrator.def b/configdefinitions/src/vespa/vespa.orchestrator.config.orchestrator.def
index ab52c777398..ab52c777398 100644
--- a/configdefinitions/src/vespa/orchestrator.def
+++ b/configdefinitions/src/vespa/vespa.orchestrator.config.orchestrator.def