summaryrefslogtreecommitdiffstats
path: root/playbooks
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 /playbooks
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 'playbooks')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml7
-rw-r--r--playbooks/common/openshift-master/tasks/wire_aggregator.yml7
2 files changed, 12 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index f4dc9df8a..05b37d59f 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -22,8 +22,13 @@
- name: restart master api
service: name={{ openshift.common.service_type }}-master-controllers state=restarted
notify: verify api server
+ # We retry the controllers because the API may not be 100% initialized yet.
- name: restart master controllers
- service: name={{ openshift.common.service_type }}-master-controllers state=restarted
+ command: "systemctl restart {{ openshift.common.service_type }}-master-controllers"
+ retries: 3
+ delay: 5
+ register: result
+ until: result.rc == 0
- name: verify api server
command: >
curl --silent --tlsv1.2
diff --git a/playbooks/common/openshift-master/tasks/wire_aggregator.yml b/playbooks/common/openshift-master/tasks/wire_aggregator.yml
index 560eea785..df3ea27b4 100644
--- a/playbooks/common/openshift-master/tasks/wire_aggregator.yml
+++ b/playbooks/common/openshift-master/tasks/wire_aggregator.yml
@@ -179,8 +179,13 @@
- yedit_output.changed
- openshift.master.cluster_method == 'native'
+# 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: "systemctl restart {{ openshift.common.service_type }}-master-controllers"
+ retries: 3
+ delay: 5
+ register: result
+ until: result.rc == 0
when:
- yedit_output.changed
- openshift.master.cluster_method == 'native'