summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-20 13:49:27 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-20 13:49:27 -0500
commit5478379a432dafc7bfed7999e127ff45a4105417 (patch)
treebc0c11bc3669d60450a03c6e28ca2c3f4a99a387 /roles
parent9712e8250ddc5088b9f33d5349fcab6308adf459 (diff)
parent24c97766aed6286e1c3636db1deae576a343d351 (diff)
downloadopenshift-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 'roles')
-rw-r--r--roles/openshift_master/tasks/main.yml1
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 44e7e3178..bc5269b3d 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -51,6 +51,7 @@
embedded_dns: "{{ openshift_master_embedded_dns | default(None) }}"
dns_port: "{{ openshift_master_dns_port | default(None) }}"
bind_addr: "{{ openshift_master_bind_addr | default(None) }}"
+ pod_eviction_timeout: "{{ openshift_master_pod_eviction_timeout | default(None) }}"
portal_net: "{{ openshift_master_portal_net | default(None) }}"
session_max_seconds: "{{ openshift_master_session_max_seconds | default(None) }}"
session_name: "{{ openshift_master_session_name | default(None) }}"
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