ceph-common: use rh_storage_version variable to enable the correct repos

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rhbz#1346812
(cherry picked from commit 4e5eedd434b0833f40f0a97b345096a545a95ddf)

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index a56d4b7ab1ebc0e134aef1c7c3243891833d9d45..e969128cd62fe63d7e18f67c0803f2b93cae0dc1 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -124,6 +124,8 @@ ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64
 # on RHEL 7.
 #
 ceph_stable_rh_storage: false
+# This will affect how/what repositories are enabled depending on the desired
+# version. The next version will use "2" not "2.0" which would not work.
 ceph_stable_rh_storage_version: 1.3 # next version is 2
 ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com

diff --git a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
index 1879f38bb7fd3b6764f363fa6da05819402be91d..6c1ce119c7f53543eeb173db395ae14853a31b58 100644 (file)
--- a/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
+++ b/roles/ceph-common/tasks/pre_requisites/prerequisite_rh_storage_cdn_install.yml
@@ -5,42 +5,42 @@
   changed_when: false
 
 - name: check if the red hat storage monitor repo is already present
-  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-mon-rpms
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-mon-rpms
   changed_when: false
   failed_when: false
   register: rh_storage_mon_repo
   when: mon_group_name in group_names
 
 - name: enable red hat storage monitor repository
-  command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-mon-rpms
+  command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-mon-rpms
   changed_when: false
   when:
     mon_group_name in group_names and
     rh_storage_mon_repo.rc != 0
 
 - name: check if the red hat storage osd repo is already present
-  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-osd-rpms
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-osd-rpms
   changed_when: false
   failed_when: false
   register: rh_storage_osd_repo
   when: osd_group_name in group_names
 
 - name: enable red hat storage osd repository
-  command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-osd-rpms
+  command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-osd-rpms
   changed_when: false
   when:
     osd_group_name in group_names and
     rh_storage_osd_repo.rc != 0
 
 - name: check if the red hat storage rados gateway repo is already present
-  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-tools-rpms
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-tools-rpms
   changed_when: false
   failed_when: false
   register: rh_storage_rgw_repo
   when: rgw_group_name in group_names
 
 - name: enable red hat storage rados gateway repository
-  command: subscription-manager repos --enable rhel-7-server-rhceph-1.3-tools-rpms
+  command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_stable_rh_storage_version }}-tools-rpms
   changed_when: false
   when:
     rgw_group_name in group_names and