diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2017-02-07 10:12:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 10:12:58 -0500 |
| commit | af24a2d38995d1eba94baddd0e3c746f1d9887da (patch) | |
| tree | d0073e42b18c74fdc8488512bb35b4b424894cb1 /inventory | |
| parent | 880547d938e5b8a3918f812d71fb10358d5681e5 (diff) | |
| parent | 10ef2f931240e473581bf22f15e3d4c81d334c97 (diff) | |
| download | openshift-af24a2d38995d1eba94baddd0e3c746f1d9887da.tar.gz openshift-af24a2d38995d1eba94baddd0e3c746f1d9887da.tar.bz2 openshift-af24a2d38995d1eba94baddd0e3c746f1d9887da.tar.xz openshift-af24a2d38995d1eba94baddd0e3c746f1d9887da.zip | |
Merge pull request #3260 from ashcrow/1395168
Copies CloudFront pem file to registry hosts
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 6 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 83cfc617f..c5f9db909 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -386,6 +386,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_pullthrough=true #openshift_hosted_registry_acceptschema2=true #openshift_hosted_registry_enforcequota=true +# +# Additional CloudFront Options. When using CloudFront all three +# of the followingg variables must be defined. +#openshift_hosted_registry_storage_s3_cloudfront_baseurl=https://myendpoint.cloudfront.net/ +#openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile=/full/path/to/secret.pem +#openshift_hosted_registry_storage_s3_cloudfront_keypairid=yourpairid # 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 12f957170..cacdbf115 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -358,6 +358,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_storage_volume_size=10Gi # # AWS S3 +# # S3 bucket must already exist. #openshift_hosted_registry_storage_kind=object #openshift_hosted_registry_storage_provider=s3 @@ -386,6 +387,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_hosted_registry_pullthrough=true #openshift_hosted_registry_acceptschema2=true #openshift_hosted_registry_enforcequota=true +# +# Additional CloudFront Options. When using CloudFront all three +# of the followingg variables must be defined. +#openshift_hosted_registry_storage_s3_cloudfront_baseurl=https://myendpoint.cloudfront.net/ +#openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile=/full/path/to/secret.pem +#openshift_hosted_registry_storage_s3_cloudfront_keypairid=yourpairid # Metrics deployment # See: https://docs.openshift.com/enterprise/latest/install_config/cluster_metrics.html |