diff options
| author | jawed <jawed.khelil@amadeus.com> | 2016-02-04 10:48:42 +0100 |
|---|---|---|
| committer | jawed <jawed.khelil@amadeus.com> | 2016-02-04 10:57:39 +0100 |
| commit | 53516f7ecb05e0cb262891b690cbae8e6ad9e55b (patch) | |
| tree | cee8442dbaa842b8b9f243153b30e0b8960402bc /playbooks | |
| parent | 73ab565d036b6f3c8777d305fdc1a5029b097f88 (diff) | |
| download | openshift-53516f7ecb05e0cb262891b690cbae8e6ad9e55b.tar.gz openshift-53516f7ecb05e0cb262891b690cbae8e6ad9e55b.tar.bz2 openshift-53516f7ecb05e0cb262891b690cbae8e6ad9e55b.tar.xz openshift-53516f7ecb05e0cb262891b690cbae8e6ad9e55b.zip | |
Make pod_eviction_timeout configurable from cli
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 |
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'] |