ceph_pool: use default size/min_size and rule_name

Before [1] we were using default value for
  - size
  - min_size
  - rule_name

when the key wasn't present in the pool dict.

The commit [1] changed this by defaulting to omit.

This patch restores the original workflow by using facts:
  - osd_pool_default_size
  - osd_pool_default_min_size
  - ceph_osd_pool_default_crush_rule_name

[1] af9f6684f297d223b7bffc77ea50d3eec2665c15

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 6f35763b90cd6d5192026a1e5f6ab5d12f828ee7..31de328d91ad77230e2b1c9e385da39feeee0583 100644 (file)
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -80,10 +80,10 @@
         cluster: "{{ cluster }}"
         pg_num: "{{ item.pg_num | default(osd_pool_default_pg_num) if not item.0.pg_autoscale_mode | default(False) | bool else 16 }}"
         pgp_num: "{{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) if not item.pg_autoscale_mode | default(False) | bool else omit }}"
-        size: "{{ item.size | default(omit) }}"
-        min_size: "{{ item.min_size | default(omit) }}"
+        size: "{{ item.size | default(osd_pool_default_size) }}"
+        min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
         pool_type: "{{ item.type | default('replicated') }}"
-        rule_name: "{{ item.rule_name | default(omit) }}"
+        rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
         erasure_profile: "{{ item.erasure_profile | default(omit) }}"
         pg_autoscale_mode: "{{ item.pg_autoscale_mode | default(omit) }}"
         target_size_ratio: "{{ item.target_size_ratio | default(omit) }}"

diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml
index 7ebb65ac420c76ddf117742dd70f1fc6459431f9..af2ca091811e3886292525f7b525543a219bc4a6 100644 (file)
--- a/roles/ceph-mds/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml
@@ -16,10 +16,10 @@
             cluster: "{{ cluster }}"
             pg_num: "{{ item.pg_num | default(osd_pool_default_pg_num) if not item.0.pg_autoscale_mode | default(False) | bool else 16 }}"
             pgp_num: "{{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) if not item.pg_autoscale_mode | default(False) | bool else omit }}"
-            size: "{{ item.size | default(omit) }}"
-            min_size: "{{ item.min_size | default(omit) }}"
+            size: "{{ item.size | default(osd_pool_default_size) }}"
+            min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
             pool_type: "{{ item.type | default('replicated') }}"
-            rule_name: "{{ item.rule_name | default(omit) }}"
+            rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
             erasure_profile: "{{ item.erasure_profile | default(omit) }}"
             pg_autoscale_mode: "{{ item.pg_autoscale_mode | default(omit) }}"
             target_size_ratio: "{{ item.target_size_ratio | default(omit) }}"

diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml
index a88ccca2dd67cf5a2f7ee3973f1ca475854804d8..e53bb676d7924d75fcceb48ef0a713dec86bd3c6 100644 (file)
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -8,10 +8,10 @@
         cluster: "{{ cluster }}"
         pg_num: "{{ item.pg_num | default(osd_pool_default_pg_num) if not item.0.pg_autoscale_mode | default(False) | bool else 16 }}"
         pgp_num: "{{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) if not item.pg_autoscale_mode | default(False) | bool else omit }}"
-        size: "{{ item.size | default(omit) }}"
-        min_size: "{{ item.min_size | default(omit) }}"
+        size: "{{ item.size | default(osd_pool_default_size) }}"
+        min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
         pool_type: "{{ item.type | default('replicated') }}"
-        rule_name: "{{ item.rule_name | default(omit) }}"
+        rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
         erasure_profile: "{{ item.erasure_profile | default(omit) }}"
         pg_autoscale_mode: "{{ item.pg_autoscale_mode | default(omit) }}"
         target_size_ratio: "{{ item.target_size_ratio | default(omit) }}"