summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-02-01 10:30:53 -0500
committerGitHub <noreply@github.com>2018-02-01 10:30:53 -0500
commit24f9b73bb9a6d6197a5028fe0d223c8823e2905e (patch)
treed97de0bd3d574dada209d7ddf4d67b64cb4b46da /roles/openshift_master/tasks
parent8d2f2d7820b5c238f4723e4eade3882ca7332685 (diff)
parent4f7d963986a1e28ecc6abd15532b0c1aece99be1 (diff)
downloadopenshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.gz
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.bz2
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.xz
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.zip
Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-play
Remove master_ha bool checks
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml2
-rw-r--r--roles/openshift_master/tasks/restart.yml17
2 files changed, 8 insertions, 11 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index b12a6b346..41f2ee2a5 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -227,7 +227,7 @@
- pause:
seconds: 15
when:
- - openshift.master.ha | bool
+ - openshift_master_ha | bool
- name: Start and enable master api all masters
systemd:
diff --git a/roles/openshift_master/tasks/restart.yml b/roles/openshift_master/tasks/restart.yml
index 715347101..f7697067a 100644
--- a/roles/openshift_master/tasks/restart.yml
+++ b/roles/openshift_master/tasks/restart.yml
@@ -3,7 +3,6 @@
service:
name: "{{ openshift_service_type }}-master-api"
state: restarted
- when: openshift_master_ha | bool
- name: Wait for master API to come back online
wait_for:
host: "{{ openshift.common.hostname }}"
@@ -11,12 +10,10 @@
delay: 10
port: "{{ openshift.master.api_port }}"
timeout: 600
- when: openshift_master_ha | bool
-- name: Restart master controllers
- service:
- name: "{{ openshift_service_type }}-master-controllers"
- state: restarted
- # Ignore errrors since it is possible that type != simple for
- # pre-3.1.1 installations.
- ignore_errors: true
- when: openshift_master_ha | bool
+# We retry the controllers because the API may not be 100% initialized yet.
+- name: restart master controllers
+ command: "systemctl restart {{ openshift_service_type }}-master-controllers"
+ retries: 3
+ delay: 5
+ register: result
+ until: result.rc == 0