diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-07-08 12:46:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 12:46:27 +0200 |
| commit | f5bd06c2626a75a36f74f243e6f990e9e221077c (patch) | |
| tree | 5889264759c2ebdec88f1128d8ba202673144503 /playbooks | |
| parent | 2c647a966f141dff1aa1d716747e44b7d0923fd1 (diff) | |
| parent | 50801900dbb5e32682af2c68c30b13b73bd6919b (diff) | |
| download | openshift-f5bd06c2626a75a36f74f243e6f990e9e221077c.tar.gz openshift-f5bd06c2626a75a36f74f243e6f990e9e221077c.tar.bz2 openshift-f5bd06c2626a75a36f74f243e6f990e9e221077c.tar.xz openshift-f5bd06c2626a75a36f74f243e6f990e9e221077c.zip | |
Merge pull request #4624 from ingvagabund/increase-timeout-when-waiting-for-master-and-nodes
increase implicit 300s default timeout to explicit 600s
Diffstat (limited to 'playbooks')
4 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml b/playbooks/common/openshift-cluster/upgrades/docker/restart.yml index 1b418920f..96c729d79 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/restart.yml @@ -24,4 +24,5 @@ state: started delay: 10 port: "{{ openshift.master.api_port }}" + timeout: 600 when: inventory_hostname in groups.oo_masters_to_config diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml index 67ba0aa2e..a5dbe0590 100644 --- a/playbooks/common/openshift-master/restart_hosts.yml +++ b/playbooks/common/openshift-master/restart_hosts.yml @@ -37,3 +37,4 @@ state: started delay: 10 port: "{{ openshift.master.api_port }}" + timeout: 600 diff --git a/playbooks/common/openshift-master/restart_services.yml b/playbooks/common/openshift-master/restart_services.yml index 508b5a3ac..a844fb369 100644 --- a/playbooks/common/openshift-master/restart_services.yml +++ b/playbooks/common/openshift-master/restart_services.yml @@ -15,6 +15,7 @@ state: started delay: 10 port: "{{ openshift.master.api_port }}" + timeout: 600 when: openshift_master_ha | bool - name: Restart master controllers service: diff --git a/playbooks/common/openshift-node/restart.yml b/playbooks/common/openshift-node/restart.yml index 01cf948e0..63273cb78 100644 --- a/playbooks/common/openshift-node/restart.yml +++ b/playbooks/common/openshift-node/restart.yml @@ -36,6 +36,7 @@ state: started delay: 10 port: "{{ openshift.master.api_port }}" + timeout: 600 when: inventory_hostname in groups.oo_masters_to_config - name: restart node |