From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 18 Dec 2018 00:43:35 +0000 (-0800)
Subject: ceph_key: if initial keys are missing, report which ones
X-Git-Tag: v4.0.0beta1~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=160090b441882daa7378b43b42fb110f1f6b5d64;p=ceph-ansible.git

ceph_key: if initial keys are missing, report which ones

Fixes: #3461
Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

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: