group_vars: default to version 2 of RHCS

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

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 3c6167920cb07b5400490792c913111cbd9f649f..2045ee8800685565346ebb90c0dde5de3b26b35d 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -133,8 +133,8 @@ dummy:
 #
 #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
+# version. The previous  version was "1.3".
+#ceph_stable_rh_storage_version: 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
 #ceph_stable_rh_storage_iso_path:

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index e969128cd62fe63d7e18f67c0803f2b93cae0dc1..7f970d1699aa285511230ca3b060130c762c214b 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -125,8 +125,8 @@ ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64
 #
 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
+# version. The previous  version was "1.3".
+ceph_stable_rh_storage_version: 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
 #ceph_stable_rh_storage_iso_path: