From: Giulio Fidente Date: Fri, 19 Jul 2019 08:58:49 +0000 (+0200) Subject: Fix backward compat with old cephfs_pools format X-Git-Tag: v4.0.0rc12~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=985165dbf7f505b1632441a35c6432383e0adf43;p=ceph-ansible.git Fix backward compat with old cephfs_pools format Previously cephfs_pools items used to have a pgs: key but not pgp_num: nor pg_num: Signed-off-by: Giulio Fidente (cherry picked from commit edd1420217d96d87ce84700317b50256648e1fa3) --- diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml index a45c2b6d8..cda1f508c 100644 --- a/roles/ceph-mds/tasks/create_mds_filesystems.yml +++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml @@ -26,7 +26,7 @@ {{ hostvars[groups[mon_group_name][0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd pool create {{ item.name }} {{ item.pg_num | default(osd_pool_default_pg_num) }} - {{ item.pgp_num | default(item.pg_num) }} + {{ item.pgp_num | default(item.pg_num) | default(osd_pool_default_pg_num) }} {{ 'replicated_rule' if not item.rule_name | default('replicated_rule') else item.rule_name | default('replicated_rule') }} {{ 1 if item.type|default(1) == 'replicated' else 3 if item.type|default(1) == 'erasure' else item.type|default(1) }} {%- if (item.type | default("1") == '3' or item.type | default("1") == 'erasure') and item.erasure_profile != '' %}