summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-06 15:04:12 -0800
committerGitHub <noreply@github.com>2017-11-06 15:04:12 -0800
commit4bf7a5b7472a48438f23542f127e8ab988d6f453 (patch)
treed65ffc98c152b3c932538f8636b103fa21865e80 /roles/openshift_logging
parenta62b37b9109ce17f36254b9374e7fda803198de6 (diff)
parenteb9914420e8c327a998531a4bb7a6b8406b4316f (diff)
downloadopenshift-4bf7a5b7472a48438f23542f127e8ab988d6f453.tar.gz
openshift-4bf7a5b7472a48438f23542f127e8ab988d6f453.tar.bz2
openshift-4bf7a5b7472a48438f23542f127e8ab988d6f453.tar.xz
openshift-4bf7a5b7472a48438f23542f127e8ab988d6f453.zip
Merge pull request #6027 from mgugino-upstream-stage/retry-restart-master-controllers
Automatic merge from submit-queue. Retry restarting master controllers Currently, master controller services may fail to restart if master api services are not fully initialized. This commit enables retry of master controllers. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509837
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/handlers/main.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml
index ce7688581..acc838bd1 100644
--- a/roles/openshift_logging/handlers/main.yml
+++ b/roles/openshift_logging/handlers/main.yml
@@ -4,8 +4,13 @@
when: (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native'
notify: Verify API Server
+# We retry the controllers because the API may not be 100% initialized yet.
- name: restart master controllers
- systemd: name={{ openshift.common.service_type }}-master-controllers state=restarted
+ command: "{{ openshift.common.service_type }}-master-controllers"
+ retries: 3
+ delay: 5
+ register: result
+ until: result.rc == 0
when: (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native'
- name: Verify API Server