]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-daemon: fix get_config_and_both_keyrings() return value
authorSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 18:31:16 +0000 (13:31 -0500)
committerSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 18:31:16 +0000 (13:31 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon

index bea87e145abddbafad282064fd8107dd67b6de47..fceaac43815d8e13740363a01e6aaf1b8c43f84d 100755 (executable)
@@ -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)