From: Alfredo Deza Date: Fri, 23 Sep 2016 17:20:46 +0000 (-0600) Subject: group_vars: default to version 2 of RHCS X-Git-Tag: v1.0.7~14^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F999%2Fhead;p=ceph-ansible.git group_vars: default to version 2 of RHCS This RHCS version is now generally available. Default to using it. Signed-off-by: Alfredo Deza Signed-off-by: Ken Dreyer Related: rhbz#1357631 --- diff --git a/group_vars/all.sample b/group_vars/all.sample index 0c56c9ce9..8112a98ff 100644 --- 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 04f9cc5bd..e56539d4e 100644 --- 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: