From 160090b441882daa7378b43b42fb110f1f6b5d64 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 17 Dec 2018 16:43:35 -0800 Subject: [PATCH] ceph_key: if initial keys are missing, report which ones Fixes: #3461 Signed-off-by: Dan Mick --- library/ceph_key.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/library/ceph_key.py b/library/ceph_key.py index bad741b38..41287c93e 100644 --- a/library/ceph_key.py +++ b/library/ceph_key.py @@ -481,8 +481,13 @@ def lookup_ceph_initial_entities(module, out): fatal("'auth_dump' key not present in json output:", module) # noqa E501 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 @@ -650,8 +655,6 @@ def run_module(): module.exit_json(**result) entities = lookup_ceph_initial_entities(module, out) - if entities is None: - fatal("Failed to find some of the initial entities", module) output_format = "plain" for entity in entities: -- 2.39.5