From d6e71d769c02a368401ddf6e8b7803a0d47987c6 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 5 Mar 2019 17:29:40 -0500
Subject: [PATCH] common: Use rhsm_repository module for RHCS

Instead of using subscription-manager with command module we can use
the rhsm_repository ansible module.
This module already uses repos list feature to determine if a
repository is enabled or not. That way this module is idempotent so
we don't need changed_when: false anymore.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---
 .../prerequisite_rhcs_cdn_install.yml         | 46 +++----------------
 1 file changed, 7 insertions(+), 39 deletions(-)

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 2eceff664..7deeedd82 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -1,50 +1,18 @@
 ---
-- name: check if the red hat storage monitor repo is already present
-  yum:
-    list: repos
-    update_cache: no
-  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
-  changed_when: false
+  rhsm_repository:
+    name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms"
   when:
     - (mon_group_name in group_names or mgr_group_name in group_names)
-    - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-mon-rpms' not in rhcs_mon_repo.results"
-
-- name: check if the red hat storage osd repo is already present
-  yum:
-    list: repos
-    update_cache: no
-  register: rhcs_osd_repo
-  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
-  changed_when: false
+  rhsm_repository:
+    name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms"
   when:
     - osd_group_name in group_names
-    - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-osd-rpms' not in rhcs_osd_repo.results"
-
-- name: check if the red hat storage tools repo is already present
-  yum:
-    list: repos
-    update_cache: no
-  register: rhcs_tools_repo
-  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
-  changed_when: false
+  rhsm_repository:
+    name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms"
   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)
-    - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-tools-rpms' not in rhcs_tools_repo.results"
\ No newline at end of file
+    - (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)
\ No newline at end of file