ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph_key: if initial keys are missing, report which ones 

Fixes: #3461
Signed-off-by: Dan Mick <dan.mick@redhat.com>
pull/3466/head
Dan Mick 2018-12-17 16:43:35 -08:00 committed by Sébastien Han
parent 1dd26f76bf
commit 160090b441
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/ceph_key.py
View File

@ -481,8 +481,13 @@ def lookup_ceph_initial_entities(module, out):
fatal("'auth_dump' key not present in json output:", module) # noqa E501 fatal("'auth_dump' key not present in json output:", module) # noqa E501
if len(entities) != len(CEPH_INITIAL_KEYS): if len(entities) != len(CEPH_INITIAL_KEYS):
return None # must be missing in auth_dump, as if it were in CEPH_INITIAL_KEYS
# it'd be in entities from the above test. Report what's missing.
missing = []
for e in CEPH_INITIAL_KEYS:
if e not in entities:
missing.append(e)
fatal("initial keyring does not contain keys: " + ' '.join(missing), module)
return entities return entities
@ -650,8 +655,6 @@ def run_module():
module.exit_json(**result) module.exit_json(**result)
entities = lookup_ceph_initial_entities(module, out) entities = lookup_ceph_initial_entities(module, out)
if entities is None:
fatal("Failed to find some of the initial entities", module)
output_format = "plain" output_format = "plain"
for entity in entities: for entity in entities: