]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-rgw: remove ceph_pool state and default value
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 14 Sep 2020 18:34:07 +0000 (14:34 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Fri, 25 Sep 2020 18:05:34 +0000 (14:05 -0400)
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)

roles/ceph-rgw/tasks/rgw_create_pools.yml

index 7a11f4766eeae89d4abaad67d535929a37f9aadd..0099c6fa73fc92185e5a453892e9bc9e35e4845c 100644 (file)
@@ -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) }}"
 - 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] }}"