diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2019-09-11 15:12:18 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@verizonmedia.com> | 2019-09-11 15:12:18 +0200 |
| commit | 849142885f742d6eff17f03b23d7c1f902e05087 (patch) | |
| tree | 01a6f8c542b03adfe25e5667be06637a3ad553fe /controller-server | |
| parent | ffd0b50717701611690aad59a8dc9eabc9fafd6d (diff) | |
Use correct domain in cd
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 5 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 88c89be3bc3..b1b5c9bea53 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -677,6 +677,7 @@ public class InternalStepRunner implements StepRunner { int jdiscMemoryPercentage = (int) Math.ceil(200.0 / memoryGb); // 2Gb memory for tester application (excessive?). int testMemoryMb = 512 * (memoryGb - 2); // Memory allocated to Surefire running tests. ≥25% left for other stuff. + AthenzDomain idDomain = ("vespa.vespa.cd".equals(domain.value()) ? AthenzDomain.from("vespa.vespa") : domain); String servicesXml = "<?xml version='1.0' encoding='UTF-8'?>\n" + "<services xmlns:deploy='vespa' version='1.0'>\n" + @@ -706,8 +707,8 @@ public class InternalStepRunner implements StepRunner { " </tlsClientAuthEnforcer>\n" + " </config>\n" + " <ssl>\n" + - " <private-key-file>/var/lib/sia/keys/" + domain.value() + ".tenant.key.pem</private-key-file>\n" + - " <certificate-file>/var/lib/sia/certs/" + domain.value() + ".tenant.cert.pem</certificate-file>\n" + + " <private-key-file>/var/lib/sia/keys/" + idDomain.value() + ".tenant.key.pem</private-key-file>\n" + + " <certificate-file>/var/lib/sia/certs/" + idDomain.value() + ".tenant.cert.pem</certificate-file>\n" + " <client-authentication>want</client-authentication>\n" + " </ssl>\n" + " </server>\n" + diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 17d9045b581..5f374b7ea98 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -26,8 +26,8 @@ </tlsClientAuthEnforcer> </config> <ssl> - <private-key-file>/var/lib/sia/keys/vespa.vespa.cd.tenant.key.pem</private-key-file> - <certificate-file>/var/lib/sia/certs/vespa.vespa.cd.tenant.cert.pem</certificate-file> + <private-key-file>/var/lib/sia/keys/vespa.vespa.tenant.key.pem</private-key-file> + <certificate-file>/var/lib/sia/certs/vespa.vespa.tenant.cert.pem</certificate-file> <client-authentication>want</client-authentication> </ssl> </server> |