diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-08-17 15:33:21 -0400 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2017-08-17 17:28:39 -0400 |
| commit | fb0adaad2e27f80ecae7790b206b29cbebdae36a (patch) | |
| tree | d710cb5483fd0f077b1e58cbb034d594e306972d /roles/openshift_hosted/templates | |
| parent | cf1aa0e3bc4bc207a0da718695326b6850b90610 (diff) | |
| download | openshift-fb0adaad2e27f80ecae7790b206b29cbebdae36a.tar.gz openshift-fb0adaad2e27f80ecae7790b206b29cbebdae36a.tar.bz2 openshift-fb0adaad2e27f80ecae7790b206b29cbebdae36a.tar.xz openshift-fb0adaad2e27f80ecae7790b206b29cbebdae36a.zip | |
Allow GCS object storage to be configured
Previously, setting the GCS registry object storage settings resulted in
an invalid configuration. This generates a registry-config secret that
has the correct file if the GCS config is set.
Diffstat (limited to 'roles/openshift_hosted/templates')
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config_secret.j2 | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index fc9272679..61da452de 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -60,7 +60,7 @@ storage: gcs: bucket: {{ openshift_hosted_registry_storage_gcs_bucket }} {% if openshift_hosted_registry_storage_gcs_keyfile is defined %} - keyfile: {{ openshift_hosted_registry_storage_gcs_keyfile }} + keyfile: /etc/registry/gcs.json {% endif -%} {% if openshift_hosted_registry_storage_gcs_rootdirectory is defined %} rootdirectory: {{ openshift_hosted_registry_storage_gcs_rootdirectory }} diff --git a/roles/openshift_hosted/templates/registry_config_secret.j2 b/roles/openshift_hosted/templates/registry_config_secret.j2 deleted file mode 100644 index ca68544ec..000000000 --- a/roles/openshift_hosted/templates/registry_config_secret.j2 +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: registry-config - annotations: - provider: {{ openshift.hosted.registry.storage.provider }} -data: - config.yml: {{ registry_config }} |