From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 25 Sep 2020 19:01:16 +0000 (+0200)
Subject: Revert "ceph-rgw: remove ceph_pool state and default value"
X-Git-Tag: v6.0.0alpha2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf7b044c9a7b23fa912331cd24896d883ace8f0b;p=ceph-ansible.git

Revert "ceph-rgw: remove ceph_pool state and default value"

This reverts commit ba3512a8fcffdbbd40fbd41f4e16b0d3ca1ca328.
---

diff --git a/roles/ceph-rgw/tasks/rgw_create_pools.yml b/roles/ceph-rgw/tasks/rgw_create_pools.yml
index 0099c6fa7..7a11f4766 100644
--- a/roles/ceph-rgw/tasks/rgw_create_pools.yml
+++ b/roles/ceph-rgw/tasks/rgw_create_pools.yml
@@ -30,6 +30,7 @@
 - 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) }}"
@@ -48,12 +49,13 @@
 - 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(omit) }}"
+    size: "{{ item.value.size | default(osd_pool_default_size) }}"
     pool_type: replicated
-    rule_name: "{{ item.value.rule_name | default(omit) }}"
+    rule_name: "{{ item.value.rule_name | default(ceph_osd_pool_default_crush_rule_name) }}"
     application: rgw
   loop: "{{ rgw_create_pools | dict2items }}"
   delegate_to: "{{ groups[mon_group_name][0] }}"