ceph-daemon: make ceph-volume use get_config_and_keyring

This will always take the first config+keyring json branch.

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index c2f131a5b59d1bd77312273fcc14f76b582f2011..59f8a46781e89f50dfca3c0ad146ab22ce584671 100755 (executable)
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -779,15 +779,9 @@ def command_ceph_volume():
     tmp_keyring = None
 
     if args.config_and_keyring:
-        import json
-        if args.config_and_keyring == '-':
-            j = sys.stdin.read()
-        else:
-            with open(args.config_and_keyring, 'r') as f:
-                j = f.read()
-        d = json.loads(j)
-        config = d.get('config')
-        keyring = d.get('keyring')
+        # note: this will always pull from args.config_and_keyring (we
+        # require it) and never args.config or args.keyring.
+        (config, keyring) = get_config_and_keyring()
 
         # tmp keyring file
         tmp_keyring = tempfile.NamedTemporaryFile(mode='w')