Revert "ceph_pool: use default size/min_size and rule_name"

This reverts commit 142934057f7a0485eca060c02892d8dac22a0f12.

This is already handled in the ceph_pool module itself

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

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index 81d19195989815bb80d97075aba991b1c7306f44..bb48000e19b78ff618d68912cf1fde9991ea51fc 100644 (file)
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -79,10 +79,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(osd_pool_default_size) }}"
-        min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
+        size: "{{ item.size | default(omit) }}"
+        min_size: "{{ item.min_size | default(omit) }}"
         pool_type: "{{ item.type | default('replicated') }}"
-        rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
+        rule_name: "{{ item.rule_name | default(omit) }}"
         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 19d8f28c2d20f67eb72c07b5155c8166a54ddc39..7b87af36ee83ee504a3b263440dd252a7eab0a57 100644 (file)
--- a/roles/ceph-mds/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml
@@ -15,10 +15,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(osd_pool_default_size) }}"
-            min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
+            size: "{{ item.size | default(omit) }}"
+            min_size: "{{ item.min_size | default(omit) }}"
             pool_type: "{{ item.type | default('replicated') }}"
-            rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
+            rule_name: "{{ item.rule_name | default(omit) }}"
             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 4605caa16a52b571e6f0c72d9716e1458eab27e1..d239e5ea37834580e709c71be724e344ddd553c0 100644 (file)
--- a/roles/ceph-osd/tasks/openstack_config.yml
+++ b/roles/ceph-osd/tasks/openstack_config.yml
@@ -7,10 +7,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(osd_pool_default_size) }}"
-        min_size: "{{ item.min_size | default(osd_pool_default_min_size) }}"
+        size: "{{ item.size | default(omit) }}"
+        min_size: "{{ item.min_size | default(omit) }}"
         pool_type: "{{ item.type | default('replicated') }}"
-        rule_name: "{{ item.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
+        rule_name: "{{ item.rule_name | default(omit) }}"
         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) }}"