diff options
| author | gjoranv <gv@oath.com> | 2018-03-02 13:11:07 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2018-03-08 13:07:27 +0100 |
| commit | cef7b3a9660b00a85ea91b7ce57f9e7ab80c1657 (patch) | |
| tree | 2cd381947cdaa865de81f3f2fc92a9a840adbb68 /config-model | |
| parent | 81de70de2966f8048b76ccf893810978a623e6d6 (diff) | |
Extract method to keep addClusterContent clean and "short".
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 97cfffb2042..265fd22e30f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -171,8 +171,10 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addServerProviders(spec, cluster); addLegacyFilters(spec, cluster); // TODO: Remove for Vespa 7 - // Athenz copper argos - // NOTE: Must be done after addNodes() + addAthensCopperArgos(cluster, context); // Must be added after nodes. + } + + private void addAthensCopperArgos(ContainerCluster cluster, ConfigModelContext context) { app.getDeployment().map(DeploymentSpec::fromXml) .ifPresent(deploymentSpec -> { addIdentityProvider(cluster, |