summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@tobru.ch>2016-10-12 20:37:28 +0200
committerTobias Brunner <tobias@tobru.ch>2016-10-12 20:37:28 +0200
commitff70636ff0c08a119d57af6492f9267a7282781e (patch)
tree18b117dc3dff7d0ba981ffba72011e1192c58ab0
parentf47c871eafed2bb862d16ee83db2a1562f1b3aea (diff)
downloadopenshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.gz
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.bz2
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.tar.xz
openshift-ff70636ff0c08a119d57af6492f9267a7282781e.zip
adjustments in docs and j2 template
-rw-r--r--inventory/byo/hosts.origin.example3
-rw-r--r--inventory/byo/hosts.ose.example16
-rw-r--r--roles/openshift_hosted/templates/registry_config.j24
3 files changed, 20 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 1c14002e0..86a287f14 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -352,7 +352,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_hosted_registry_acceptschema2=true
#openshift_hosted_registry_enforcequota=true
#
-# Any S3 service (Minio, ExoScale, ...)
+# 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
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 2e5b7564d..667ab7ab9 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 2fc38a8cf..b60175ccd 100644
--- a/roles/openshift_hosted/templates/registry_config.j2
+++ b/roles/openshift_hosted/templates/registry_config.j2
@@ -13,8 +13,8 @@ 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 }}
+{% 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