diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-20 13:49:27 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-20 13:49:27 -0500 |
| commit | 5478379a432dafc7bfed7999e127ff45a4105417 (patch) | |
| tree | bc0c11bc3669d60450a03c6e28ca2c3f4a99a387 /inventory/byo | |
| parent | 9712e8250ddc5088b9f33d5349fcab6308adf459 (diff) | |
| parent | 24c97766aed6286e1c3636db1deae576a343d351 (diff) | |
| download | openshift-5478379a432dafc7bfed7999e127ff45a4105417.tar.gz openshift-5478379a432dafc7bfed7999e127ff45a4105417.tar.bz2 openshift-5478379a432dafc7bfed7999e127ff45a4105417.tar.xz openshift-5478379a432dafc7bfed7999e127ff45a4105417.zip | |
Merge pull request #1243 from jstuever/podevictiontimeout
Enable kubernetes master config of podEvictionTimeout from ansible
Diffstat (limited to 'inventory/byo')
| -rw-r--r-- | inventory/byo/hosts.aep.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example index a92b8e0fc..fd23dddb1 100644 --- a/inventory/byo/hosts.aep.example +++ b/inventory/byo/hosts.aep.example @@ -117,6 +117,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # default project node selector #osm_default_node_selector='region=primary' +# Override the default pod eviction timeout +#openshift_master_pod_eviction_timeout=5m + # 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'] diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index c8a9918ac..5dbe77305 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -122,6 +122,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # default project node selector #osm_default_node_selector='region=primary' +# Override the default pod eviction timeout +#openshift_master_pod_eviction_timeout=5m + # 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'] diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 2619c2416..a567321b7 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -117,6 +117,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # default project node selector #osm_default_node_selector='region=primary' +# Override the default pod eviction timeout +#openshift_master_pod_eviction_timeout=5m + # 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'] |