summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-13 10:16:43 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-13 10:59:49 -0500
commit2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69 (patch)
tree893c5a814dcd751445930e5ca08cffd125bc1db2 /roles/openshift_master
parent609469eb8d25baeee30cda96377c9b3fda6e499d (diff)
downloadopenshift-2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69.tar.gz
openshift-2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69.tar.bz2
openshift-2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69.tar.xz
openshift-2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69.zip
Add wait in between api and controllers start for native ha.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index b43e9177e..150b76fc8 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -283,12 +283,13 @@
service: name={{ openshift.common.service_type }}-master-api enabled=yes state=started
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
register: start_result
- notify: Verify API Server
- set_fact:
master_api_service_status_changed: "{{ start_result | changed }}"
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
+# A separate wait is required here for native HA since notifies will
+# be resolved after all tasks in the role.
- name: Wait for API to become available
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
@@ -299,11 +300,7 @@
retries: 120
delay: 1
changed_when: false
-
-- fail:
- msg: >
- Unable to contact master API at {{ openshift.master.api_url }}
- when: api_available_output.stdout.find("200 OK") == -1
+ when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and master_api_service_status_changed | bool
- name: Start and enable master controller
service: name={{ openshift.common.service_type }}-master-controllers enabled=yes state=started