summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_cluster
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2016-01-20 15:01:38 -0500
committerMatt Woodson <mwoodson@gmail.com>2016-01-20 15:01:38 -0500
commit9410cdff9342fae80a3149c530b819e473996cce (patch)
treecf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /roles/openshift_master_cluster
parenta2b745039bce597d419b03fdce39b4c6c69139f6 (diff)
parentbdedb63403ea582c4aaa5f56caed302f51744de2 (diff)
downloadopenshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz
openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2
openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz
openshift-9410cdff9342fae80a3149c530b819e473996cce.zip
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master_cluster')
-rw-r--r--roles/openshift_master_cluster/tasks/configure.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_master_cluster/tasks/configure.yml b/roles/openshift_master_cluster/tasks/configure.yml
index 7ab9afb51..1b94598dd 100644
--- a/roles/openshift_master_cluster/tasks/configure.yml
+++ b/roles/openshift_master_cluster/tasks/configure.yml
@@ -34,11 +34,10 @@
- name: Disable stonith
command: pcs property set stonith-enabled=false
-# TODO: handle case where api port is not 8443
- name: Wait for the clustered master service to be available
wait_for:
host: "{{ openshift_master_cluster_vip }}"
- port: 8443
+ port: "{{ openshift.master.api_port }}"
state: started
timeout: 180
delay: 90