summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorStefanie Forrester <dak1n1@users.noreply.github.com>2015-09-02 13:55:07 -0700
committerStefanie Forrester <dak1n1@users.noreply.github.com>2015-09-02 13:55:07 -0700
commit795a1d2c6a34d1ca3eb8e84325d9109d134e0a33 (patch)
tree7a43a84c31481ef98ca681cad14794f16ff4c335 /playbooks
parentf29e614a40f99d5024f372bf538fcfa72db49140 (diff)
parent21596a2dd2ef0239592f9376223a993cab5e9944 (diff)
downloadopenshift-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
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/config.yml1
1 files changed, 1 insertions, 0 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: