From a4db9bd6e84d7201c5916c69af187cc7a03c68bf Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 21 Nov 2018 17:08:19 +0100 Subject: [PATCH] defaults: change for default pool size for cephfs_pools default pool size should match the real default that is defined in ceph itself. Signed-off-by: Guillaume Abrioux (cherry picked from commit fdc438dd0dd7ad91b296008a7335460a88c2ca4a) --- group_vars/all.yml.sample | 4 ++-- group_vars/rhcs.yml.sample | 4 ++-- roles/ceph-defaults/defaults/main.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 5606e3556..f73d12b22 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -354,8 +354,8 @@ dummy: #cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem #cephfs_pools: -# - { name: "{{ cephfs_data }}", pgs: "{{ osd_pool_default_pg_num }}", size: "" } -# - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "" } +# - { name: "{{ cephfs_data }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } +# - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } ## OSD options # diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 7cd0c7017..89c0c604a 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -354,8 +354,8 @@ ceph_rhcs_version: 3 #cephfs_metadata: cephfs_metadata # name of the metadata pool for a given filesystem #cephfs_pools: -# - { name: "{{ cephfs_data }}", pgs: "{{ osd_pool_default_pg_num }}", size: "" } -# - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "" } +# - { name: "{{ cephfs_data }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } +# - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } ## OSD options # diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 7bb8226ef..87ebce2ac 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -346,8 +346,8 @@ 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: "{{ osd_pool_default_pg_num }}", size: "" } - - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "" } + - { name: "{{ cephfs_data }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } + - { name: "{{ cephfs_metadata }}", pgs: "{{ osd_pool_default_pg_num }}", size: "{{ osd_pool_default_size }}" } ## OSD options #