diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-01-13 10:16:43 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-01-13 10:59:49 -0500 |
| commit | 2e3e0ebe0d98f5374fbfb3a95145a9665d57fe69 (patch) | |
| tree | 893c5a814dcd751445930e5ca08cffd125bc1db2 | |
| parent | 609469eb8d25baeee30cda96377c9b3fda6e499d (diff) | |
| download | openshift-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.
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 4ecdf2a0c..0df03f194 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -313,6 +313,7 @@ - name: Configure master instances hosts: oo_masters_to_config + any_errors_fatal: true serial: 1 vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" 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 |