summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-18 16:21:52 -0400
committerGitHub <noreply@github.com>2017-07-18 16:21:52 -0400
commitde24691d903d1cd0381f684fc8050673d2d81fd7 (patch)
tree465d71baa0055542252a87868339af82928c24e4
parentfcd93e2dae1a4f2c3e4eb28e76b9b4b5bb5e1b67 (diff)
parent35919e11333886b3190ae782034944172c09ff9a (diff)
downloadopenshift-de24691d903d1cd0381f684fc8050673d2d81fd7.tar.gz
openshift-de24691d903d1cd0381f684fc8050673d2d81fd7.tar.bz2
openshift-de24691d903d1cd0381f684fc8050673d2d81fd7.tar.xz
openshift-de24691d903d1cd0381f684fc8050673d2d81fd7.zip
Merge pull request #4779 from kwoodson/define_kms_var
Verify kmskey id is defined.
-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 9673841bf..fc9272679 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -22,7 +22,7 @@ storage:
{% endif %}
bucket: {{ openshift_hosted_registry_storage_s3_bucket }}
encrypt: {{ openshift_hosted_registry_storage_s3_encrypt | default(false) }}
-{% if openshift_hosted_registry_storage_s3_kmskeyid %}
+{% if openshift_hosted_registry_storage_s3_kmskeyid is defined %}
keyid: {{ openshift_hosted_registry_storage_s3_kmskeyid }}
{% endif %}
secure: true