From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Oct 2019 18:31:16 +0000 (-0500)
Subject: ceph-daemon: fix get_config_and_both_keyrings() return value
X-Git-Tag: v15.1.0~1197^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2dacfe8be2257a2af503e0ef42be1be04e246874;p=ceph-ci.git

ceph-daemon: fix get_config_and_both_keyrings() return value

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index bea87e145ab..fceaac43815 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -316,7 +316,7 @@ def get_config_and_both_keyrings():
             with open(args.config_and_keyrings, 'r') as f:
                 j = f.read()
         d = json.loads(j)
-        (d.get('config'), d.get('keyring'), d.get('crash_keyring'))
+        return (d.get('config'), d.get('keyring'), d.get('crash_keyring'))
     else:
         if args.key:
             keyring = '[%s]\n\tkey = %s\n' % (args.name, args.key)