diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2019-09-16 14:24:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 14:24:40 +0200 |
| commit | 1e497dcc775620f360bade02913338b098277142 (patch) | |
| tree | b0152fa496d2a130fdfc1ecb7417195eb44c235e /controller-server | |
| parent | b54222edf2b71f89a20a01a89633411edc737b82 (diff) | |
Revert "Add truststore to testerapp 4443 port "
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 1 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 1 |
2 files changed, 0 insertions, 2 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 b40677a5dc9..fdce18f46b2 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 @@ -738,7 +738,6 @@ public class InternalStepRunner implements StepRunner { " <ssl>\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" + - " <ca-certificates-file>/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem</ca-certificates-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 3b1554c6604..53461a1098e 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -31,7 +31,6 @@ <ssl> <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> - <ca-certificates-file>/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem</ca-certificates-file> <client-authentication>want</client-authentication> </ssl> </server> |