Fixes failure of cephfs configuration using --limit

Configuration of cephfs with an existing cluster using --limit used to fail
at different tasks while running with site-docker.yml
This commit addresses both of those tasks

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1773489
Signed-off-by: VasishtaShastry <vipin.indiasmg@gmail.com>
(cherry picked from commit 72c43cc5d9)
pull/4773/head
VasishtaShastry 2019-11-18 15:19:17 +05:30 committed by Dimitri Savineau
parent 225d4ceabc
commit 4edef59feb
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@
- /var/lib/ceph/mds/{{ cluster }}-{{ mds_name }}
- name: get keys from monitors
command: "{{ hostvars[groups.get(mon_group_name)[0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} auth get {{ item.name }}"
command: "{{ container_exec_cmd | default('') }} ceph --cluster {{ cluster }} auth get {{ item.name }}"
register: _mds_keys
with_items:
- { name: "client.bootstrap-mds", path: "/var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring", copy_key: true }
@ -32,4 +32,4 @@
with_items: "{{ _mds_keys.results }}"
when:
- cephx | bool
- item.item.copy_key | bool
- item.item.copy_key | bool

View File

@ -23,7 +23,7 @@
block:
- name: create filesystem pools
command: >
{{ hostvars[groups[mon_group_name][0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }}
{{ 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) | default(osd_pool_default_pg_num) }}