group_vars: resync group_vars

The previous commit changed the content of roles/$ROLE/default/main.yml
so we have to re generate the group_vars files.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b142bf4a01c31570758f8e78db90d0094434f42d..dbaae46a22afbca4a7b44cbfd740fb16eedea282 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -533,7 +533,6 @@ dummy:
 #docker_pull_timeout: "300s"
 
 
-
 #############
 # OPENSTACK #
 #############

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index b142bf4a01c31570758f8e78db90d0094434f42d..cdefcd0ca05d136b4a4458f35f69db1d3d73ed64 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -29,7 +29,7 @@ dummy:
 #  mimic: 13
 
 # Directory to fetch cluster fsid, keys etc...
-#fetch_directory: fetch/
+fetch_directory: ~/ceph-ansible-keys
 
 # The 'cluster' variable determines the name of the cluster.
 # Changing the default value to something else means that you will
@@ -135,14 +135,14 @@ dummy:
 # - 'distro' means that no separate repo file will be added
 #  you will get whatever version of Ceph is included in your Linux distro.
 # 'local' means that the ceph binaries will be copied over from the local machine
-#ceph_origin: "{{ 'repository' if ceph_rhcs or ceph_stable or ceph_dev or ceph_stable_uca or ceph_custom else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
+ceph_origin: repository
 #valid_ceph_origins:
 #  - repository
 #  - distro
 #  - local
 
 
-#ceph_repository: "{{ 'community' if ceph_stable else 'rhcs' if ceph_rhcs else 'dev' if ceph_dev else 'uca' if ceph_stable_uca else 'custom' if ceph_custom else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
+ceph_repository: rhcs
 #valid_ceph_repository:
 #  - community
 #  - rhcs
@@ -533,7 +533,6 @@ dummy:
 #docker_pull_timeout: "300s"
 
 
-
 #############
 # OPENSTACK #
 #############