refact osd pool size customization

Add real default value for osd pool size customization.
Ceph itself has an `osd_pool_default_size` default value to `3`.

If users don't specify a pool size in various pools definition within
ceph-ansible, we should default to `3`.

By the way, this kind of condition isn't really clear:
```
when:
  - rbd_pool_size | default ("")
```

we should try to get the customized value then default to what is in
`osd_pool_default_size` (which has its default value pointing to
`ceph_osd_pool_default_size` (`3`) as well) and compare it to
`ceph_osd_pool_default_size`.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/iscsigws.yml.sample b/group_vars/iscsigws.yml.sample
index 5dfe68d202ff705b82441197b8f7ef76b4281712..4ab76d2c5e5c27a3ec2f73da5b56f19f973220f0 100644 (file)
--- a/group_vars/iscsigws.yml.sample
+++ b/group_vars/iscsigws.yml.sample
@@ -64,7 +64,7 @@ dummy:
 # Whether or not to generate secure certificate to iSCSI gateway nodes
 #generate_crt: False
 
-#rbd_pool_size: ""
+#rbd_pool_size: "{{ osd_pool_default_size }}"
 
 ##################
 # RBD-TARGET-API #

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index 4f7be2b437da2f2b38f97b424c19732f12183408..f74c21e16e3adbb415da9ca66a7aa07826b322cb 100644 (file)
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -122,13 +122,13 @@
     - name: customize pool size
       command: >
         {{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }}
-        osd pool set {{ item.name }} size {{ item.size | default('') }}
+        osd pool set {{ item.name }} size {{ item.size | default(osd_pool_default_size) }}
       with_items: "{{ pools | unique }}"
       delegate_to: "{{ delegated_node }}"
       changed_when: false
       when:
         - pools | length > 0
-        - item.size | default ("")
+        - item.size | default(osd_pool_default_size) != ceph_osd_pool_default_size
 
 - name: get client cephx keys
   copy:

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 2f63a4fba0d02c29006a60e4bdd57640dfdd1ebe..b96d0574fbf334a7ffe6d76957797845a4b1f8a0 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -244,6 +244,10 @@
   set_fact:
     osd_pool_default_pg_num: "{{ ceph_conf_overrides.get('global', {}).get('osd_pool_default_pg_num', ceph_osd_pool_default_pg_num) }}"
 
+- name: set_fact osd_pool_default_size
+  set_fact:
+    osd_pool_default_size: "{{ ceph_conf_overrides.get('global', {}).get('osd_pool_default_size', ceph_osd_pool_default_size) }}"
+
 - name: import_tasks set_monitor_address.yml
   import_tasks: set_monitor_address.yml
 

diff --git a/roles/ceph-iscsi-gw/defaults/main.yml b/roles/ceph-iscsi-gw/defaults/main.yml
index 5ec740b14f4cd68e03478247d11d28d6c5a2e35a..5ffd64bb72f57cd0e6e4f144a8147ab0888de066 100644 (file)
--- a/roles/ceph-iscsi-gw/defaults/main.yml
+++ b/roles/ceph-iscsi-gw/defaults/main.yml
@@ -56,7 +56,7 @@ client_connections: {}
 # Whether or not to generate secure certificate to iSCSI gateway nodes
 generate_crt: False
 
-rbd_pool_size: ""
+rbd_pool_size: "{{ osd_pool_default_size }}"
 
 ##################
 # RBD-TARGET-API #

diff --git a/roles/ceph-iscsi-gw/tasks/common.yml b/roles/ceph-iscsi-gw/tasks/common.yml
index 7c8acc1ea62fc52e9726902ea37b80106107bb70..3d4a556fd41523ff1dfc34dd8c0dbca8cce2a2ad 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/common.yml
+++ b/roles/ceph-iscsi-gw/tasks/common.yml
@@ -41,8 +41,8 @@
       delegate_to: "{{ groups[mon_group_name][0] }}"
 
     - name: customize pool size
-      command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool set rbd size {{ rbd_pool_size | default('') }}"
+      command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool set rbd size {{ rbd_pool_size | default(osd_pool_default_size) }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       changed_when: false
       when:
-        - rbd_pool_size | default ("")
+        - rbd_pool_size | default(osd_pool_default_size) != ceph_osd_pool_default_size

diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml
index b94087f3361ed87ec6d2e46661438602f166fd2f..208aa8ae099a85329eaab58fb14cae64cf043f70 100644 (file)
--- a/roles/ceph-mds/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml
@@ -9,11 +9,12 @@
         - "{{ cephfs_pools }}"
 
     - name: customize pool size
-      command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd pool set {{ item.name }} size {{ item.size | default('') }}"
+      command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd pool set {{ item.name }} size {{ item.size | default(osd_pool_default_size) }}"
       with_items: "{{ cephfs_pools | unique }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       changed_when: false
-      when: item.size | default ("")
+      when:
+        - item.size | default(osd_pool_default_size) != ceph_osd_pool_default_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 34e9e6aadc49c7195d6d33ed8d5472363a93fe9d..d1b6d8e68050a4bbd3fcbf60497f5502ab722363 100644 (file)
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -44,11 +44,12 @@
     - name: customize pool size
       command: >
         {{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }}
-        osd pool set {{ item.name }} size {{ item.size | default('') }}
+        osd pool set {{ item.name }} size {{ item.size | default(osd_pool_default_size) }}
       with_items: "{{ openstack_pools | unique }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       changed_when: false
-      when: item.size | default ("")
+      when:
+        - item.size | default(osd_pool_default_size) != ceph_osd_pool_default_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 }}"

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 447861c4f9be603a45b648e470011fef8d60b9ab..f3941b126b422d2f85c0ae3a5580c375b2080eeb 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -34,9 +34,10 @@
       run_once: true
 
     - name: customize pool size
-      command: "{{ docker_exec_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool set {{ item.key }} size {{ item.size | default('') }}"
+      command: "{{ docker_exec_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool set {{ item.key }} size {{ item.size | default(osd_pool_default_size) }}"
       with_dict: "{{ rgw_create_pools }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       changed_when: false
       run_once: true
-      when: item.size | default ("")
+      when:
+        - item.size | default(osd_pool_default_size) != ceph_osd_pool_default_size