diff options
| author | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-09-02 13:55:07 -0700 |
|---|---|---|
| committer | Stefanie Forrester <dak1n1@users.noreply.github.com> | 2015-09-02 13:55:07 -0700 |
| commit | 795a1d2c6a34d1ca3eb8e84325d9109d134e0a33 (patch) | |
| tree | 7a43a84c31481ef98ca681cad14794f16ff4c335 | |
| parent | f29e614a40f99d5024f372bf538fcfa72db49140 (diff) | |
| parent | 21596a2dd2ef0239592f9376223a993cab5e9944 (diff) | |
| download | openshift-795a1d2c6a34d1ca3eb8e84325d9109d134e0a33.tar.gz openshift-795a1d2c6a34d1ca3eb8e84325d9109d134e0a33.tar.bz2 openshift-795a1d2c6a34d1ca3eb8e84325d9109d134e0a33.tar.xz openshift-795a1d2c6a34d1ca3eb8e84325d9109d134e0a33.zip | |
Merge pull request #505 from dak1n1/waitfor_etcd
wait for ports instead of waiting for an arbitrary period of time
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | roles/fluentd_master/tasks/main.yml | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index d7c4044e0..4a4a69f50 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -186,6 +186,7 @@ vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" + embedded_etcd: "{{ openshift.master.embedded_etcd }}" pre_tasks: - name: Ensure certificate directory exists file: diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index d592dc306..69f8eceab 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -39,8 +39,13 @@ owner: 'td-agent' mode: 0444 -- name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes." - pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes|int * 5)) }} +- name: wait for etcd to start up + wait_for: port=4001 delay=10 + when: embedded_etcd | bool + +- name: wait for etcd peer to start up + wait_for: port=7001 delay=10 + when: embedded_etcd | bool - name: ensure td-agent is running service: |