diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-04-03 16:27:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 16:27:01 -0400 |
| commit | a78377505359b6e865c02e1f42cc387a92297bb4 (patch) | |
| tree | 7085c31cf9ba346260809c04b90481c041a9f859 | |
| parent | 62a49cc8620db5ac0add61727229ac35d0be2b3c (diff) | |
| parent | aaf1c30265aabf1353914c3e9b7582d4617a6341 (diff) | |
| download | openshift-a78377505359b6e865c02e1f42cc387a92297bb4.tar.gz openshift-a78377505359b6e865c02e1f42cc387a92297bb4.tar.bz2 openshift-a78377505359b6e865c02e1f42cc387a92297bb4.tar.xz openshift-a78377505359b6e865c02e1f42cc387a92297bb4.zip | |
Merge pull request #3842 from abutcher/doc-etcd-ca-expiry
Document etcd_ca_default_days in example inventories.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 7 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index d61f033f8..27914e60a 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -757,13 +757,18 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # by deployment_type=origin #openshift_enable_origin_repo=false -# Validity of the auto-generated certificates in days. +# Validity of the auto-generated OpenShift certificates in days. # See also openshift_hosted_registry_cert_expire_days above. # #openshift_ca_cert_expire_days=1825 #openshift_node_cert_expire_days=730 #openshift_master_cert_expire_days=730 +# Validity of the auto-generated external etcd certificates in days. +# Controls validity for etcd CA, peer, server and client certificates. +# +#etcd_ca_default_days=1825 + # host group for masters [masters] ose3-master[1:3]-ansible.test.example.com diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 823d6f58f..f0269bff8 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -754,13 +754,18 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Enable API service auditing, available as of 3.2 #openshift_master_audit_config={"basicAuditEnabled": true} -# Validity of the auto-generated certificates in days. +# Validity of the auto-generated OpenShift certificates in days. # See also openshift_hosted_registry_cert_expire_days above. # #openshift_ca_cert_expire_days=1825 #openshift_node_cert_expire_days=730 #openshift_master_cert_expire_days=730 +# Validity of the auto-generated external etcd certificates in days. +# Controls validity for etcd CA, peer, server and client certificates. +# +#etcd_ca_default_days=1825 + # host group for masters [masters] ose3-master[1:3]-ansible.test.example.com |