From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 14 Sep 2020 18:34:07 +0000 (-0400)
Subject: ceph-rgw: remove ceph_pool state and default value
X-Git-Tag: v5.0.2~34
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7e2e11320d95d13071c30742108f086526557d72;p=ceph-ansible.git

ceph-rgw: remove ceph_pool state and default value

Since the state is now optional and default values are handled in the
ceph_pool module itself.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit ba3512a8fcffdbbd40fbd41f4e16b0d3ca1ca328)
---

diff --git a/roles/ceph-rgw/tasks/rgw_create_pools.yml b/roles/ceph-rgw/tasks/rgw_create_pools.yml
index 7a11f4766..0099c6fa7 100644
--- a/roles/ceph-rgw/tasks/rgw_create_pools.yml
+++ b/roles/ceph-rgw/tasks/rgw_create_pools.yml
@@ -30,7 +30,6 @@
 - name: create ec pools for rgw
   ceph_pool:
     name: "{{ item.key }}"
-    state: present
     cluster: "{{ cluster }}"
     pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
     pgp_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
@@ -49,13 +48,12 @@
 - name: create replicated pools for rgw
   ceph_pool:
     name: "{{ item.key }}"
-    state: present
     cluster: "{{ cluster }}"
     pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
     pgp_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
-    size: "{{ item.value.size | default(osd_pool_default_size) }}"
+    size: "{{ item.value.size | default(omit) }}"
     pool_type: replicated
-    rule_name: "{{ item.value.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
+    rule_name: "{{ item.value.rule_name | default(omit) }}"
     application: rgw
   loop: "{{ rgw_create_pools | dict2items }}"
   delegate_to: "{{ groups[mon_group_name][0] }}"