diff options
| author | Tobias Brunner <tobias.brunner@vshn.ch> | 2016-10-12 17:24:19 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias.brunner@vshn.ch> | 2016-10-12 17:24:19 +0200 |
| commit | f47c871eafed2bb862d16ee83db2a1562f1b3aea (patch) | |
| tree | c97159bffa4405c92d1594f3e0134b8ebadbf115 | |
| parent | e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa (diff) | |
| download | openshift-f47c871eafed2bb862d16ee83db2a1562f1b3aea.tar.gz openshift-f47c871eafed2bb862d16ee83db2a1562f1b3aea.tar.bz2 openshift-f47c871eafed2bb862d16ee83db2a1562f1b3aea.tar.xz openshift-f47c871eafed2bb862d16ee83db2a1562f1b3aea.zip | |
add regionendpoint parameter for registry s3
| -rw-r--r-- | inventory/byo/hosts.origin.example | 15 | ||||
| -rw-r--r-- | roles/openshift_hosted/templates/registry_config.j2 | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 0f0e223ce..1c14002e0 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -351,6 +351,21 @@ 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, ...) +# 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..2fc38a8cf 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 openshift.hosted.registry.storage.s3.regionendpoint %} + regionendpoint: {{ aws_bucket_region_endpoint }} +{% endif -%} bucket: {{ openshift.hosted.registry.storage.s3.bucket }} encrypt: false secure: true |