diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-17 16:04:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 16:04:11 -0400 |
| commit | 69d3800c55bd6b8bdca40d93030b3bfb794fee15 (patch) | |
| tree | cb5568d0dd8c1d52467595cef468134c34605110 /roles/openshift_hosted | |
| parent | da7551b82fc37a77181a8c9aa9b82060b7101c5f (diff) | |
| parent | 09e74fa8f619038ea06723392ce0d620ffbc6d3a (diff) | |
| download | openshift-69d3800c55bd6b8bdca40d93030b3bfb794fee15.tar.gz openshift-69d3800c55bd6b8bdca40d93030b3bfb794fee15.tar.bz2 openshift-69d3800c55bd6b8bdca40d93030b3bfb794fee15.tar.xz openshift-69d3800c55bd6b8bdca40d93030b3bfb794fee15.zip | |
Merge pull request #4594 from kwoodson/encryption
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_hosted')
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index dc8a9f089..9673841bf 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -21,7 +21,10 @@ storage: regionendpoint: {{ openshift_hosted_registry_storage_s3_regionendpoint }} {% endif %} bucket: {{ openshift_hosted_registry_storage_s3_bucket }} - encrypt: false + encrypt: {{ openshift_hosted_registry_storage_s3_encrypt | default(false) }} +{% if openshift_hosted_registry_storage_s3_kmskeyid %} + keyid: {{ openshift_hosted_registry_storage_s3_kmskeyid }} +{% endif %} secure: true v4auth: true rootdirectory: {{ openshift_hosted_registry_storage_s3_rootdirectory | default('/registry') }} |