summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/templates
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-02-15 09:36:37 -0500
committerSteve Milner <smilner@redhat.com>2017-02-16 09:18:52 -0500
commitd4d197b83decbea47756a8381eec2a5d74d451ff (patch)
treeb5523ee464f3ddaa1b97e228409b1ca713f5313c /roles/openshift_hosted/templates
parentec7340eb707ca25716b02d06bfb3fc16796aeaca (diff)
downloadopenshift-d4d197b83decbea47756a8381eec2a5d74d451ff.tar.gz
openshift-d4d197b83decbea47756a8381eec2a5d74d451ff.tar.bz2
openshift-d4d197b83decbea47756a8381eec2a5d74d451ff.tar.xz
openshift-d4d197b83decbea47756a8381eec2a5d74d451ff.zip
Register cloudfront privkey when required
Diffstat (limited to 'roles/openshift_hosted/templates')
-rw-r--r--roles/openshift_hosted/templates/registry_config.j22
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: