Merge pull request #10008 from sdodson/bz1623145

Retry our etcd health check

roles/etcd/tasks/remove-etcd-v2-data.yml

@@ -1,6 +1,10 @@
 ---
 - name: Verify cluster is healthy pre-upgrade
   command: "{{ etcdctlv2 }} cluster-health"
+  register: cluster_health
+  retries: 30
+  delay: 6
+  until: cluster_health.rc == 0
 
 - name: Check migrated status
   command: "{{ etcdctlv2 }} get /kubernetes.io"

roles/etcd/tasks/upgrade_rpm.yml

@@ -10,6 +10,10 @@
 
 - name: Verify cluster is healthy pre-upgrade
   command: "{{ etcdctlv2 }} cluster-health"
+  register: cluster_health
+  retries: 30
+  delay: 6
+  until: cluster_health.rc == 0
 
 - set_fact:
     l_etcd_target_package: "{{ 'etcd' if r_etcd_upgrade_version is not defined else 'etcd-'+r_etcd_upgrade_version+'*' }}"

roles/etcd/tasks/upgrade_static.yml

@@ -5,6 +5,10 @@
 
 - name: Verify cluster is healthy pre-upgrade
   command: "{{ etcdctlv2 }} cluster-health"
+  register: cluster_health
+  retries: 30
+  delay: 6
+  until: cluster_health.rc == 0
 
 - name: Check for old etcd service files
   stat: