diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-17 09:34:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 09:34:24 -0500 |
| commit | f39408aada18ab6cf6f87d00f11ddeb3984816b9 (patch) | |
| tree | b1f9e0aef5932770dedb8417f2919ce26bf5f91c /roles/openshift_hosted/templates | |
| parent | 49a59bc96e30e1d966a6581003e5d99f6909cc4b (diff) | |
| parent | d4d197b83decbea47756a8381eec2a5d74d451ff (diff) | |
| download | openshift-f39408aada18ab6cf6f87d00f11ddeb3984816b9.tar.gz openshift-f39408aada18ab6cf6f87d00f11ddeb3984816b9.tar.bz2 openshift-f39408aada18ab6cf6f87d00f11ddeb3984816b9.tar.xz openshift-f39408aada18ab6cf6f87d00f11ddeb3984816b9.zip | |
Merge pull request #3369 from ashcrow/attach-cloudfront
WIP: Register cloudfront privkey when required
Diffstat (limited to 'roles/openshift_hosted/templates')
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index 557fd03af..f3336334a 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -78,7 +78,7 @@ middleware: - name: cloudfront options: baseurl: {{ openshift_hosted_registry_storage_s3_cloudfront_baseurl }} - privatekey: {{ openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile }} + privatekey: /etc/origin/cloudfront.pem keypairid: {{ openshift_hosted_registry_storage_s3_cloudfront_keypairid }} {% elif openshift.common.version_gte_3_3_or_1_3 | bool %} storage: |