group_vars: default to version 2 of RHCS

This RHCS version is now generally available. Default to using it.

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Related: rhbz#1357631

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 0c56c9ce9824ee52996272fca2c36819052d904f..8112a98ffce4c4b0fea55c202fd957d15c048f9d 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -147,8 +147,8 @@ dummy:
 #
 #ceph_rhcs: 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_rhcs_version: 1.3 # next version is 2
+# version. The previous version was 1.3. The current version is 2.
+#ceph_rhcs_version: 2
 #ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 #ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_rhcs_iso_path:

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 04f9cc5bd2b49a4f46e7d5d5271b3405be0f050b..e56539d4e9bc0a35e59f53e51d6bf23e5326ae9f 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -139,8 +139,8 @@ ceph_stable_redhat_distro: el7
 #
 ceph_rhcs: 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_rhcs_version: 1.3 # next version is 2
+# version. The previous version was 1.3. The current version is 2.
+ceph_rhcs_version: 2
 ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_rhcs_iso_path: