From 4d32ecc9807742f033ad84169cb1d9357ef7140d Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 5 Mar 2019 14:17:11 -0500 Subject: [PATCH] Force osd pool min_size value to integer After b8d580b and e9e5d5a we could have either item.min_size or osd_pool_default_min_size using string instead of int causing the condition to be true when it's false. As a result, the task could try to set the pool min_size value to 0 which leads to: Error EINVAL: pool min_size must be between 1 and 1 Signed-off-by: Dimitri Savineau --- 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 bb088c6b3..1f69024ad 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))|int > 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 276647ab4..97f89fb76 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))|int > 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 40590a7b4..2fa2f79be 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))|int > 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