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 <dsavinea@redhat.com>

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index bb088c6b3304a59f0666bce86c375a7a3f157efe..1f69024ad87e1e021d744c967aa8153219e70e19 100644 (file)
--- 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 276647ab4490b7ff34661b610b6174c1414b0129..97f89fb76e27fe8f24a900af7886386ee86fdfe0 100644 (file)
--- 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 40590a7b4943fa83fd53c78ba7fdca4684eeb01f..2fa2f79bed30ac614589caaaa814be5e320ba102 100644 (file)
--- 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 }}"