lint: Remote package tasks should have a retry

Make linter happy and add more robustness to remote tasks by retrying 3
times (the default) before failing.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/installs/debian_community_repository.yml b/roles/ceph-common/tasks/installs/debian_community_repository.yml
index 202ead939435f12d7956625c64c835218f93fb57..5306eaeebb037b0bacef5264dc6bac90e75e3023 100644 (file)
--- a/roles/ceph-common/tasks/installs/debian_community_repository.yml
+++ b/roles/ceph-common/tasks/installs/debian_community_repository.yml
@@ -3,6 +3,8 @@
   apt_key:
     data: "{{ lookup('file', role_path+'/files/cephstable.asc') }}"
     state: present
+  register: result
+  until: result is succeeded
 
 - name: configure debian ceph stable community repository
   apt_repository:

diff --git a/roles/ceph-common/tasks/installs/install_on_clear.yml b/roles/ceph-common/tasks/installs/install_on_clear.yml
index 73c1ac87d2b1ff94427174f5867e54404477cd26..ba59cbafc06366a621566f65cf172ba4c0e88fd4 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_clear.yml
+++ b/roles/ceph-common/tasks/installs/install_on_clear.yml
@@ -3,3 +3,5 @@
   swupd:
     name: storage-cluster
     state: present
+  register: result
+  until: result is succeeded
\ No newline at end of file

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index 5c1730bdcd476ecdd8a8619e6c67f2ddf3f4042c..9a3978f001955c7cd78511cb41a4701a88f8f88f 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -8,6 +8,8 @@
   apt:
     update_cache: yes
     cache_valid_time: 3600
+  register: result
+  until: result is succeeded
 
 - name: install dependencies
   apt:

diff --git a/roles/ceph-common/tasks/installs/install_on_suse.yml b/roles/ceph-common/tasks/installs/install_on_suse.yml
index c8921a68ee30da1391a6b7360e77151c980daca4..50aa97e52c5c1b528dc6a64d7fea782d7cbc8838 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_suse.yml
+++ b/roles/ceph-common/tasks/installs/install_on_suse.yml
@@ -19,6 +19,8 @@
     state: present
     update_cache: yes
   with_items: "{{ suse_package_dependencies }}"
+  register: result
+  until: result is succeeded
 
 - name: include install_suse_packages.yml
   include_tasks: install_suse_packages.yml

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
index 471aa7260aa115a7b0cd46e9b7f2bc3c914f84ea..2eceff6642d8c27b6ed4ebdae600aab6afb43212 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -6,6 +6,7 @@
   register: rhcs_mon_repo
   when:
     - (mon_group_name in group_names or mgr_group_name in group_names)
+  until: rhcs_mon_repo is succeeded
 
 - name: enable red hat storage monitor repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
@@ -22,6 +23,7 @@
   check_mode: no
   when:
     - osd_group_name in group_names
+  until: rhcs_osd_repo is succeeded
 
 - name: enable red hat storage osd repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms
@@ -38,6 +40,7 @@
   check_mode: no
   when:
     - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names)
+  until: rhcs_tools_repo is succeeded
 
 - name: enable red hat storage tools repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
index 96e07d0b6e98c613a8153c40def1cde5d97ac57e..300a12f00021f966f667d3f6040ad9ad5195fd9f 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
@@ -3,6 +3,8 @@
   apt_key:
     data: "{{ lookup('file', role_path+'/files/cephstablerhcs.asc') }}"
     state: present
+  register: result
+  until: result is succeeded
 
 - name: enable red hat storage monitor repository for debian systems
   apt_repository:

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml
index 53f3b7f22ddc344ad7f124c580ac8ff57c715ccb..b6a7728c3d9925e305f6cb9179c53e94be6dde5a 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml
@@ -47,6 +47,8 @@
   rpm_key:
     key: "{{ ceph_rhcs_repository_path }}/RPM-GPG-KEY-redhat-release"
     state: present
+  register: result
+  until: result is succeeded
 
 - name: add red hat storage repository for redhat systems
   template:

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
index 8b6c703275a81cbf12cc096fabb476ce97910589..177abc672df90b261df76adeabe902b553d40ad5 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install_debian.yml
@@ -47,6 +47,8 @@
   apt_key:
     file: "{{ ceph_rhcs_repository_path }}/MON/release.asc"
     state: present
+  register: result
+  until: result is succeeded
 
 - name: add red hat storage repository for debian systems
   apt_repository:

diff --git a/roles/ceph-common/tasks/installs/redhat_community_repository.yml b/roles/ceph-common/tasks/installs/redhat_community_repository.yml
index 013f8aa7fa8dbfc2e973d21590b3343bbff43a6f..3e97890e18595592b48a745a263200c8c83cb0f0 100644 (file)
--- a/roles/ceph-common/tasks/installs/redhat_community_repository.yml
+++ b/roles/ceph-common/tasks/installs/redhat_community_repository.yml
@@ -3,6 +3,8 @@
   rpm_key:
     key: "{{ ceph_stable_key }}"
     state: present
+  register: result
+  until: result is succeeded
 
 - name: configure red hat ceph stable community repository
   yum_repository:
@@ -12,3 +14,5 @@
     state: present
     gpgkey: "{{ ceph_stable_key }}"
     baseurl: "{{ ceph_mirror }}/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/$basearch"
+  register: result
+  until: result is succeeded
\ No newline at end of file

diff --git a/roles/ceph-container-common/tasks/pre_requisites/debian_prerequisites.yml b/roles/ceph-container-common/tasks/pre_requisites/debian_prerequisites.yml
index c1011f2fc9d53eabead5abc04510c7d51308158b..22f3ee87dff8f8616e7f77b43467f3fdbd073795 100644 (file)
--- a/roles/ceph-container-common/tasks/pre_requisites/debian_prerequisites.yml
+++ b/roles/ceph-container-common/tasks/pre_requisites/debian_prerequisites.yml
@@ -11,6 +11,8 @@
   apt_key:
     url: https://apt.dockerproject.org/gpg
     state: present
+  register: result
+  until: result is succeeded
 
 - name: add docker and debian testing repository
   apt_repository:
@@ -64,3 +66,5 @@
   pip:
     name: six
     version: 1.9.0
+  register: result
+  until: result is succeeded
\ No newline at end of file

diff --git a/roles/ceph-handler/handlers/main.yml b/roles/ceph-handler/handlers/main.yml
index 95132e6cb967c12f178f747e1cf0a798596c2e9d..038d2d8efadc75c60ec01f2d4ef6306dd22b6170 100644 (file)
--- a/roles/ceph-handler/handlers/main.yml
+++ b/roles/ceph-handler/handlers/main.yml
@@ -4,6 +4,8 @@
     update-cache: yes
   when:
     - ansible_os_family == 'Debian'
+  register: result
+  until: result is succeeded
 
 # We only want to restart on hosts that have called the handler.
 # This var is set when he handler is called, and unset after the

diff --git a/roles/ceph-mds/tasks/non_containerized.yml b/roles/ceph-mds/tasks/non_containerized.yml
index fe5c68c8e55edda8ff69bf15c605d80705834e50..8eb15d9e7a3313d8e993c9e9b46f7f3841ca65a7 100644 (file)
--- a/roles/ceph-mds/tasks/non_containerized.yml
+++ b/roles/ceph-mds/tasks/non_containerized.yml
@@ -7,6 +7,8 @@
   when:
     - mds_group_name in group_names
     - ansible_os_family == 'Debian'
+  register: result
+  until: result is succeeded
 
 - name: install redhat ceph-mds package
   package:

diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
index 3115ed5334540ee798d0d108508ceb37760d0945..9b905aa6aab35b65f05dc2d7e57486478257461f 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
@@ -22,6 +22,8 @@
     - ceph_repository != 'rhcs'
     - ansible_os_family == 'Suse'
     - item.install | bool
+  register: result
+  until: result is succeeded
 
 # NOTE (leseb): we use root:ceph for permissions since ganesha
 # does not have the right selinux context to read ceph directories.