summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-09 16:59:28 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-09 16:59:28 -0500
commit39fc2154a5ba751b1a1550486fe33943019e8528 (patch)
treeb3ffbb659d874053e76115c3f25afb69fa35a7c2 /playbooks/common/openshift-master
parentb0d1a9f87b6587f6b42e8e0a44c53d192bcd1c4e (diff)
parent53516f7ecb05e0cb262891b690cbae8e6ad9e55b (diff)
downloadopenshift-39fc2154a5ba751b1a1550486fe33943019e8528.tar.gz
openshift-39fc2154a5ba751b1a1550486fe33943019e8528.tar.bz2
openshift-39fc2154a5ba751b1a1550486fe33943019e8528.tar.xz
openshift-39fc2154a5ba751b1a1550486fe33943019e8528.zip
Merge pull request #1330 from jkhelil/make-cli-pod-eviction-timeout-configurable
Make pod_eviction_timeout configurable from cli
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 3d646be64..540c6a148 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -18,6 +18,10 @@
- .config_managed
- set_fact:
+ openshift_master_pod_eviction_timeout: "{{ lookup('oo_option', 'openshift_master_pod_eviction_timeout') | default(none, true) }}"
+ when: openshift_master_pod_eviction_timeout is not defined
+
+ - set_fact:
openshift_master_etcd_port: "{{ (etcd_client_port | default('2379')) if (groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config) else none }}"
openshift_master_etcd_hosts: "{{ hostvars
| oo_select_keys(groups['oo_etcd_to_config']