diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-01-16 14:50:54 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-01-16 14:51:14 +0100 |
| commit | fa941edcc71086a1a829cdb5a56199f2f66fdd5d (patch) | |
| tree | 3000df09dc9f619762164676890c62f39fd8eda6 /athenz-identity-provider-service | |
| parent | 28e010df8cf069a9e4e8b940a4322ed83ebb1a61 (diff) | |
Use hostname if loadBalancerAddress is not set
Diffstat (limited to 'athenz-identity-provider-service')
| -rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java index f188fba5074..ddf56476c24 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java @@ -5,6 +5,7 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.config.provision.Zone; import com.yahoo.log.LogLevel; +import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; import org.bouncycastle.asn1.ASN1ObjectIdentifier; @@ -72,7 +73,9 @@ public class CertificateSigner { ConfigserverConfig configserverConfig, AthenzProviderServiceConfig config, Zone zone) { - this(getPrivateKey(keyProvider, config, zone), configserverConfig.loadBalancerAddress(), Clock.systemUTC()); + this(getPrivateKey(keyProvider, config, zone), + !configserverConfig.loadBalancerAddress().isEmpty() ? configserverConfig.loadBalancerAddress() : Defaults.getDefaults().vespaHostname(), // TODO Remove once vips in main is ready + Clock.systemUTC()); } CertificateSigner(PrivateKey caPrivateKey, String loadBalancerAddress, Clock clock) { |