diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-25 16:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 16:37:08 -0400 |
| commit | 2055aa066d8219393db64f42afc384c8123f48f2 (patch) | |
| tree | 119a68f8fdc766f1b785aea28902606d852b19f1 | |
| parent | 22627cb5e395f9833e2116f7f57970fe819ddc20 (diff) | |
| parent | a07eba1e05cf3f52bf247afbec514d0af6629953 (diff) | |
| download | openshift-2055aa066d8219393db64f42afc384c8123f48f2.tar.gz openshift-2055aa066d8219393db64f42afc384c8123f48f2.tar.bz2 openshift-2055aa066d8219393db64f42afc384c8123f48f2.tar.xz openshift-2055aa066d8219393db64f42afc384c8123f48f2.zip | |
Merge pull request #5861 from mtnbikenc/fix-1505537
1505537 Remove pause from master service startup
| -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' |