summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorJeremiah Stuever <jstuever@redhat.com>2016-01-19 21:00:32 -0500
committerJeremiah Stuever <jstuever@redhat.com>2016-01-20 09:03:56 -0500
commit24c97766aed6286e1c3636db1deae576a343d351 (patch)
treebc0c11bc3669d60450a03c6e28ca2c3f4a99a387 /roles/openshift_master/templates
parent9712e8250ddc5088b9f33d5349fcab6308adf459 (diff)
downloadopenshift-24c97766aed6286e1c3636db1deae576a343d351.tar.gz
openshift-24c97766aed6286e1c3636db1deae576a343d351.tar.bz2
openshift-24c97766aed6286e1c3636db1deae576a343d351.tar.xz
openshift-24c97766aed6286e1c3636db1deae576a343d351.zip
Enable kubernetes master config of podEvictionTimeout from ansible
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index dfcaf1953..768ebb2b3 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -91,7 +91,7 @@ kubernetesMasterConfig:
controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }}
masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }}
masterIP: {{ openshift.common.ip }}
- podEvictionTimeout: ""
+ podEvictionTimeout: {{ openshift.master.pod_eviction_timeout | default("") }}
proxyClientInfo:
certFile: master.proxy-client.crt
keyFile: master.proxy-client.key