diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-01-22 22:45:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 22:45:51 +0100 |
| commit | 8015f5f86229f845a2af00099408ce43aa70e99b (patch) | |
| tree | 66c9f70ae78fff60f6919b6f287b2dfbf22ed319 /athenz-identity-provider-service | |
| parent | 9ffa1b65e571c1878b3b5b26fc8f00d95efb9d3c (diff) | |
Revert "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, 1 insertions, 4 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 ddf56476c24..f188fba5074 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,7 +5,6 @@ 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; @@ -73,9 +72,7 @@ public class CertificateSigner { ConfigserverConfig configserverConfig, AthenzProviderServiceConfig config, Zone zone) { - this(getPrivateKey(keyProvider, config, zone), - !configserverConfig.loadBalancerAddress().isEmpty() ? configserverConfig.loadBalancerAddress() : Defaults.getDefaults().vespaHostname(), // TODO Remove once vips in main is ready - Clock.systemUTC()); + this(getPrivateKey(keyProvider, config, zone), configserverConfig.loadBalancerAddress(), Clock.systemUTC()); } CertificateSigner(PrivateKey caPrivateKey, String loadBalancerAddress, Clock clock) { |