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

This reverts commit ba3512a8fc.

(cherry picked from commit bf7b044c9a)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/5861/merge
Guillaume Abrioux 2020-09-25 21:01:16 +02:00 committed by Dimitri Savineau
parent a8f6324b48
commit 5538dd8b3b
1 changed files with 4 additions and 2 deletions

View File

@ -30,6 +30,7 @@
- name: create ec pools for rgw - name: create ec pools for rgw
ceph_pool: ceph_pool:
name: "{{ item.key }}" name: "{{ item.key }}"
state: present
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}" pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
pgp_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 - name: create replicated pools for rgw
ceph_pool: ceph_pool:
name: "{{ item.key }}" name: "{{ item.key }}"
state: present
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}" pg_num: "{{ item.value.pg_num | default(osd_pool_default_pg_num) }}"
pgp_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 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 application: rgw
loop: "{{ rgw_create_pools | dict2items }}" loop: "{{ rgw_create_pools | dict2items }}"
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"