Update group_vars according to defaults

b2f2426 didn't use the generate_group_vars_sample.sh script so we
currently have a difference between the content in group_vars and the
ceph-defaults/defaults directories.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 1eeddc394d)
pull/3917/merge
Dimitri Savineau 2019-04-23 16:19:00 -04:00 committed by Dimitri Savineau
parent cad35d5c52
commit 690336aabd
2 changed files with 6 additions and 6 deletions

View File

@ -356,15 +356,15 @@ dummy:
# size: "{{ osd_pool_default_size }}" # size: "{{ osd_pool_default_size }}"
# min_size: "{{ osd_pool_default_min_size }}" # min_size: "{{ osd_pool_default_min_size }}"
# rule_name: "replicated_rule" # rule_name: "replicated_rule"
#
#cephfs_metadata_pool: #cephfs_metadata_pool:
# name: "{{ cephfs_metadata }}" # name: "{{ cephfs_metadata }}"
# pgs: "{{ osd_pool_default_pg_num }}" # pgs: "{{ osd_pool_default_pg_num }}"
# size: "{{ osd_pool_default_size }}" # size: "{{ osd_pool_default_size }}"
# min_size: "{{ osd_pool_default_min_size }}" # min_size: "{{ osd_pool_default_min_size }}"
# rule_name: "replicated_rule" # rule_name: "replicated_rule"
#
#
#cephfs_pools: #cephfs_pools:
# - "{{ cephfs_data_pool }}" # - "{{ cephfs_data_pool }}"
# - "{{ cephfs_metadata_pool }}" # - "{{ cephfs_metadata_pool }}"

View File

@ -356,15 +356,15 @@ ceph_rhcs_version: 3
# size: "{{ osd_pool_default_size }}" # size: "{{ osd_pool_default_size }}"
# min_size: "{{ osd_pool_default_min_size }}" # min_size: "{{ osd_pool_default_min_size }}"
# rule_name: "replicated_rule" # rule_name: "replicated_rule"
#
#cephfs_metadata_pool: #cephfs_metadata_pool:
# name: "{{ cephfs_metadata }}" # name: "{{ cephfs_metadata }}"
# pgs: "{{ osd_pool_default_pg_num }}" # pgs: "{{ osd_pool_default_pg_num }}"
# size: "{{ osd_pool_default_size }}" # size: "{{ osd_pool_default_size }}"
# min_size: "{{ osd_pool_default_min_size }}" # min_size: "{{ osd_pool_default_min_size }}"
# rule_name: "replicated_rule" # rule_name: "replicated_rule"
#
#
#cephfs_pools: #cephfs_pools:
# - "{{ cephfs_data_pool }}" # - "{{ cephfs_data_pool }}"
# - "{{ cephfs_metadata_pool }}" # - "{{ cephfs_metadata_pool }}"