common: Retry unregister beta distro from CDN

Seeing intermittent `subscription-manager unregister` failures in Octo.
Since the register task has retries, I see no reason unregistering
can't.

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml
index 9dbbb2b2da53ba3e2a53c29f2e02642c34b29870..d6ff92b7f018916edf477d573f53c95def47bef2 100644 (file)
--- a/roles/common/tasks/rhel-entitlements.yml
+++ b/roles/common/tasks/rhel-entitlements.yml
@@ -60,6 +60,9 @@
   command: subscription-manager unregister
   when: ansible_distribution_version not in rhsm_release_list.stdout_lines
   register: unregistered_beta_distro
+  until: unregistered_beta_distro|success
+  retries: 5
+  delay: 10
 
 # Setting rhsm_registered back to false allows the rest of the playbook
 # (except beta_repos.yml) to be skipped