]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cephadm: init config and keyring with None 34156/head
authorKefu Chai <kchai@redhat.com>
Sat, 21 Mar 2020 06:07:40 +0000 (14:07 +0800)
committerSage Weil <sage@redhat.com>
Wed, 25 Mar 2020 21:35:11 +0000 (16:35 -0500)
commit3d776f1b50d34a408571c682a5eb0fc941c97cfe
treefb53baff6bda6ebca532af7ef6c6ac9e25fd14ee
parent214b49b2bcc068844a1132711e031ab57db0f662
cephadm: init config and keyring with None

and we should not assume that both `config` and `keying` are specified
when calling this method. because, for instance, `create_daemon_dirs()`
does handle the case where `config` and/or `keyring` is not specified.

this is a follow-up fix of 245d6a5cec9cc0f299613b8cc0415e494a4c3ac5

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 86de901d89b26920c1493e3867ddfafa9f9c95cd)
src/cephadm/cephadm