From: Guillaume Abrioux Date: Thu, 3 May 2018 19:36:21 +0000 (+0200) Subject: client: remove default value for pg_num in pools creation X-Git-Tag: v3.1.0rc4~22 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=861f4b876b516e36e98cf87f7ae11073d3c7858a;p=ceph-ansible.git client: remove default value for pg_num in pools creation trying to set the default value for pg_num to `hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'])` will break in case of external client nodes deployment. the `pg_num` attribute should be mandatory and be tested in future `ceph-validate` role. Signed-off-by: Guillaume Abrioux (cherry picked from commit f60b049ae53bbf54dd550587e84b986fef15fbe6) Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index d8ab3fd87..43c90ad50 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -92,8 +92,8 @@ command: > {{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool create {{ item.0.name }} - {{ item.0.get('pg_num', hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num']) }} - {{ item.0.pgp_num | default(item.0.pg_num) }} + {{ item.0.pg_num }} + {{ item.0.pgp_num }} {{ 'replicated_rule' if item.0.rule_name | default('replicated_rule') == '' else item.0.rule_name | default('replicated_rule') }} {{ 1 if item.0.type|default(1) == 'replicated' else 3 if item.0.type|default(1) == 'erasure' else item.0.type|default(1) }} {%- if (item.0.type | default("1") == '3' or item.0.type | default("1") == 'erasure') and item.0.erasure_profile != '' %}