Bläddra i källkod

Merge pull request #1883 from dgoodwin/tokenconfig

Document oauth token config inventory vars.
Jason DeTiberus 9 år sedan
förälder
incheckning
57ac47b9d3

+ 5 - 1
inventory/byo/hosts.aep.example

@@ -187,6 +187,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default pod eviction timeout
 #openshift_master_pod_eviction_timeout=5m
 
+# Override the default oauth tokenConfig settings:
+# openshift_master_access_token_max_seconds=86400
+# openshift_master_auth_token_max_seconds=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
@@ -382,7 +386,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #
 # Most environments don't require a proxy between openshift masters, nodes, and
 # etcd hosts. So automatically add those hostnames to the openshift_no_proxy list.
-# If all of your hosts share a common domain you may wish to disable this and 
+# If all of your hosts share a common domain you may wish to disable this and
 # specify that domain above.
 #openshift_generate_no_proxy_hosts=True
 #

+ 5 - 1
inventory/byo/hosts.origin.example

@@ -192,6 +192,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default pod eviction timeout
 #openshift_master_pod_eviction_timeout=5m
 
+# Override the default oauth tokenConfig settings:
+# openshift_master_access_token_max_seconds=86400
+# openshift_master_auth_token_max_seconds=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
@@ -387,7 +391,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #
 # Most environments don't require a proxy between openshift masters, nodes, and
 # etcd hosts. So automatically add those hostnames to the openshift_no_proxy list.
-# If all of your hosts share a common domain you may wish to disable this and 
+# If all of your hosts share a common domain you may wish to disable this and
 # specify that domain above.
 #openshift_generate_no_proxy_hosts=True
 #

+ 5 - 1
inventory/byo/hosts.ose.example

@@ -188,6 +188,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default pod eviction timeout
 #openshift_master_pod_eviction_timeout=5m
 
+# Override the default oauth tokenConfig settings:
+# openshift_master_access_token_max_seconds=86400
+# openshift_master_auth_token_max_seconds=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs']
@@ -383,7 +387,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #
 # Most environments don't require a proxy between openshift masters, nodes, and
 # etcd hosts. So automatically add those hostnames to the openshift_no_proxy list.
-# If all of your hosts share a common domain you may wish to disable this and 
+# If all of your hosts share a common domain you may wish to disable this and
 # specify that domain above.
 #openshift_generate_no_proxy_hosts=True
 #