diff options
| author | Russell Teague <rteague@redhat.com> | 2017-10-24 10:05:00 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-10-25 11:05:18 -0400 |
| commit | a07eba1e05cf3f52bf247afbec514d0af6629953 (patch) | |
| tree | 6277dc5e4505d75c73fde448343310804932cc62 | |
| parent | d54942dac6551d59e19e9f9a0096ca4684b7079f (diff) | |
| download | openshift-a07eba1e05cf3f52bf247afbec514d0af6629953.tar.gz openshift-a07eba1e05cf3f52bf247afbec514d0af6629953.tar.bz2 openshift-a07eba1e05cf3f52bf247afbec514d0af6629953.tar.xz openshift-a07eba1e05cf3f52bf247afbec514d0af6629953.zip | |
Remove pause from master service startup
Fixes 1505537
https://bugzilla.redhat.com/show_bug.cgi?id=1505537
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index d0bc79c0c..48b34c578 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -297,14 +297,13 @@ - openshift.master.cluster_method == 'native' - master_api_service_status_changed | bool -- name: Start and enable master controller on first master +- name: Start and enable master controller service systemd: name: "{{ openshift.common.service_type }}-master-controllers" enabled: yes state: started when: - openshift.master.cluster_method == 'native' - - inventory_hostname == openshift_master_hosts[0] register: l_start_result until: not l_start_result | failed retries: 1 @@ -315,31 +314,8 @@ when: - l_start_result | failed -- name: Wait for master controller service to start on first master - pause: - seconds: 15 - when: - - openshift.master.cluster_method == 'native' - -- name: Start and enable master controller on all masters - systemd: - name: "{{ openshift.common.service_type }}-master-controllers" - enabled: yes - state: started - when: - - openshift.master.cluster_method == 'native' - - inventory_hostname != openshift_master_hosts[0] - register: l_start_result - until: not l_start_result | failed - retries: 1 - delay: 60 - -- name: Dump logs from master-controllers if it failed - command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-controllers - when: - - l_start_result | failed - -- set_fact: +- name: Set fact master_controllers_service_status_changed + set_fact: master_controllers_service_status_changed: "{{ l_start_result | changed }}" when: - openshift.master.cluster_method == 'native' |