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

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rhbz#1346812

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6d01e97ab45769c9efa9bc7031868dad67921fef..a8d135437334b3f67cd9e9564ecf1132546a526c 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -135,6 +135,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 e926879665c1d0c92e63efd8895f66c830e65566..4c15830666f556362e7656903e15c495c72e41b8 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
     - 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
     - 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