From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 22 May 2018 14:04:15 +0000 (+0200)
Subject: defaults: resync sample files with actual defaults
X-Git-Tag: v3.2.0beta1~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8260119cd920441fa0b8ae063b3d501899406f7;p=ceph-ansible.git

defaults: resync sample files with actual defaults

6644dba5e3a46a5a8c1cf7e66b97f7b7d62e8e95 and
1f15a81c480f60bc82bfc3a1aec3fe136e6d3bc4 introduced changes some changes
in defaults variables files but it seems we've forgotten to
regenerate the sample files.
This commit aims to resync the content of `all.yml.sample`,
`mons.yml.sample` and `rhcs.yml.sample`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 59dfaaea9..483cd7be4 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -344,6 +344,17 @@ dummy:
 #ip_version: ipv4
 #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
 
+##########
+# CEPHFS #
+##########
+#cephfs: cephfs # name of the ceph filesystem
+#cephfs_data: cephfs_data # name of the data pool for a given filesystem
+#cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
+
+#cephfs_pools:
+#  - { name: "{{ cephfs_data }}", pgs: "" }
+#  - { name: "{{ cephfs_metadata }}", pgs: "" }
+
 ## OSD options
 #
 #journal_size: 5120 # OSD journal size in MB
@@ -499,8 +510,7 @@ dummy:
 #osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #rgw_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
-#containerized_deployment: "{{ True if mon_containerized_deployment or osd_containerized_deployment or mds_containerized_deployment or rgw_containerized_deployment else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
-
+#containerized_deployment: False
 
 ############
 # KV store #
diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 6d11b9419..50a004364 100644
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -37,18 +37,6 @@ dummy:
 #calamari_debug: false
 
 
-##########
-# CEPHFS #
-##########
-#cephfs: cephfs # name of the ceph filesystem
-#cephfs_data: cephfs_data # name of the data pool for a given filesystem
-#cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
-
-#cephfs_pools:
-#  - { name: "{{ cephfs_data }}", pgs: "" }
-#  - { name: "{{ cephfs_metadata }}", pgs: "" }
-
-
 ###############
 # CRUSH RULES #
 ###############
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 09842ce65..73a4f5bde 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -344,6 +344,17 @@ ceph_repository: rhcs
 #ip_version: ipv4
 #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
 
+##########
+# CEPHFS #
+##########
+#cephfs: cephfs # name of the ceph filesystem
+#cephfs_data: cephfs_data # name of the data pool for a given filesystem
+#cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem
+
+#cephfs_pools:
+#  - { name: "{{ cephfs_data }}", pgs: "" }
+#  - { name: "{{ cephfs_metadata }}", pgs: "" }
+
 ## OSD options
 #
 #journal_size: 5120 # OSD journal size in MB
@@ -499,8 +510,7 @@ ceph_repository: rhcs
 #osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #rgw_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
-#containerized_deployment: "{{ True if mon_containerized_deployment or osd_containerized_deployment or mds_containerized_deployment or rgw_containerized_deployment else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
-
+#containerized_deployment: False
 
 ############
 # KV store #