diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-09-16 15:10:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 15:10:16 +0200 |
| commit | a30ea6f8527a5d5cfacf84d4a576929b91d83153 (patch) | |
| tree | c9109f0893daf5efda232a2e115267d76b04fa2f /controller-server/src | |
| parent | 46e53cab2b7b2602b5a305785318c7657508c9ce (diff) | |
| parent | 8a1e5d56ee1f53f465d2fee77aac34c9447aecb9 (diff) | |
Merge pull request #10668 from vespa-engine/mortent/testerapp-ca-cert
Add truststore to testerapp 4443 port
Diffstat (limited to 'controller-server/src')
3 files changed, 3 insertions, 0 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 fdce18f46b2..b40677a5dc9 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,6 +738,7 @@ 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 53461a1098e..3b1554c6604 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -31,6 +31,7 @@ <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> diff --git a/controller-server/src/test/resources/test_runner_services.xml-vespa-6 b/controller-server/src/test/resources/test_runner_services.xml-vespa-6 index bf796abffb0..c9c46fdd998 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-vespa-6 +++ b/controller-server/src/test/resources/test_runner_services.xml-vespa-6 @@ -31,6 +31,7 @@ <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> |