diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-10-15 05:18:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-15 05:18:41 -0400 |
| commit | 9fa3c6c98420e4e340507193fd3ad80c15e5c19e (patch) | |
| tree | 46e659a4b61af3ca363fb4c121ee545d68340e72 | |
| parent | 5354df0d7f89e64f62385f225c90bdc765f1544e (diff) | |
| parent | a6310c37b86447270449f9f54f53e3d9e9ac5ebb (diff) | |
| download | openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.gz openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.bz2 openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.tar.xz openshift-9fa3c6c98420e4e340507193fd3ad80c15e5c19e.zip | |
Merge pull request #2590 from vshn/feature/s3_regionendpoint
add regionendpoint parameter for registry s3
| -rw-r--r-- | inventory/byo/hosts.origin.example | 16 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 16 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 3 |
3 files changed, 35 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 0f0e223ce..04922894b 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -351,6 +351,22 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_pullthrough=true #openshift_hosted_registry_acceptschema2=true #openshift_hosted_registry_enforcequota=true +# +# Any S3 service (Minio, ExoScale, ...): Basically the same as above +# but with regionendpoint configured +# S3 bucket must already exist. +#openshift_hosted_registry_storage_kind=object +#openshift_hosted_registry_storage_provider=s3 +#openshift_hosted_registry_storage_s3_accesskey=access_key_id +#openshift_hosted_registry_storage_s3_secretkey=secret_access_key +#openshift_hosted_registry_storage_s3_regionendpoint=https://myendpoint.example.com/ +#openshift_hosted_registry_storage_s3_bucket=bucket_name +#openshift_hosted_registry_storage_s3_region=bucket_region +#openshift_hosted_registry_storage_s3_chunksize=26214400 +#openshift_hosted_registry_storage_s3_rootdirectory=/registry +#openshift_hosted_registry_pullthrough=true +#openshift_hosted_registry_acceptschema2=true +#openshift_hosted_registry_enforcequota=true # Metrics deployment # See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 2e5b7564d..fd5c8a5f4 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -351,6 +351,22 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_pullthrough=true #openshift_hosted_registry_acceptschema2=true #openshift_hosted_registry_enforcequota=true +# +# Any S3 service (Minio, ExoScale, ...): Basically the same as above +# but with regionendpoint configured +# S3 bucket must already exist. +#openshift_hosted_registry_storage_kind=object +#openshift_hosted_registry_storage_provider=s3 +#openshift_hosted_registry_storage_s3_accesskey=access_key_id +#openshift_hosted_registry_storage_s3_secretkey=secret_access_key +#openshift_hosted_registry_storage_s3_regionendpoint=https://myendpoint.example.com/ +#openshift_hosted_registry_storage_s3_bucket=bucket_name +#openshift_hosted_registry_storage_s3_region=bucket_region +#openshift_hosted_registry_storage_s3_chunksize=26214400 +#openshift_hosted_registry_storage_s3_rootdirectory=/registry +#openshift_hosted_registry_pullthrough=true +#openshift_hosted_registry_acceptschema2=true +#openshift_hosted_registry_enforcequota=true # Metrics deployment # See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html diff --git a/roles/openshift_hosted/templates/registry_config.j2 b/roles/openshift_hosted/templates/registry_config.j2 index cfe7ac81c..75d8f7fa6 100644 --- a/roles/openshift_hosted/templates/registry_config.j2 +++ b/roles/openshift_hosted/templates/registry_config.j2 @@ -13,6 +13,9 @@ storage: accesskey: {{ openshift.hosted.registry.storage.s3.accesskey }} secretkey: {{ openshift.hosted.registry.storage.s3.secretkey }} region: {{ openshift.hosted.registry.storage.s3.region }} +{% if 'regionendpoint' in openshift.hosted.registry.storage.s3 %} + regionendpoint: {{ openshift.hosted.registry.storage.s3.regionendpoint }} +{% endif %} bucket: {{ openshift.hosted.registry.storage.s3.bucket }} encrypt: false secure: true |