From e9e5d5a39a7da702c726a80af0d993b98c056cb0 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 5 Mar 2019 13:46:18 +0100 Subject: [PATCH] fix pool min_size customization b8d580b3f48c69ba9882df773c4d144b73d01c95 introduced a bug when `min_size` isn't set (default to 0). Typical error: ``` Error EINVAL: pool min_size must be between 1 and 1 ``` Signed-off-by: Guillaume Abrioux --- roles/ceph-client/tasks/create_users_keys.yml | 2 +- roles/ceph-mds/tasks/create_mds_filesystems.yml | 2 +- roles/ceph-osd/tasks/openstack_config.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index 9b4ac861b..bb088c6b3 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -122,7 +122,7 @@ changed_when: false when: - pools | length > 0 - - item.min_size | default(osd_pool_default_min_size) != ceph_osd_pool_default_min_size + - item.min_size | default(osd_pool_default_min_size) > ceph_osd_pool_default_min_size - name: assign application to pool(s) command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool application enable {{ item.name }} {{ item.application }}" diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml index ff9749f2b..276647ab4 100644 --- a/roles/ceph-mds/tasks/create_mds_filesystems.yml +++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml @@ -22,7 +22,7 @@ delegate_to: "{{ groups[mon_group_name][0] }}" changed_when: false when: - - item.min_size | default(osd_pool_default_min_size) != ceph_osd_pool_default_min_size + - item.min_size | default(osd_pool_default_min_size) > ceph_osd_pool_default_min_size - name: check if ceph filesystem already exists command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} fs get {{ cephfs }}" diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index 9c5894008..40590a7b4 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -60,7 +60,7 @@ delegate_to: "{{ groups[mon_group_name][0] }}" changed_when: false when: - - item.min_size | default(osd_pool_default_min_size) != ceph_osd_pool_default_min_size + - item.min_size | default(osd_pool_default_min_size) > ceph_osd_pool_default_min_size - name: assign application to pool(s) command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd pool application enable {{ item.name }} {{ item.application }}" -- 2.39.5