ceph-volume simple.activate use the contents of the JSON file, fallback to CLI args

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c954c913395557bcd89f25b0496c4428e6109494)

diff --git a/src/ceph-volume/ceph_volume/devices/simple/activate.py b/src/ceph-volume/ceph_volume/devices/simple/activate.py
index e6959aa1806044dd507011a52925bd246ab1e7a7..06dbff4d21a1e64339e23fe4f5ae79b81ed9ac0e 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/simple/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/simple/activate.py
@@ -22,11 +22,12 @@ class Activate(object):
 
     @decorators.needs_root
     def activate(self, args):
-        osd_id = args.osd_id
-        osd_fsid = args.osd_fsid
         with open(args.json_config, 'r') as fp:
             osd_metadata = json.load(fp)
 
+        osd_id = osd_metadata.get('whoami', args.osd_id)
+        osd_fsid = osd_metadata.get('fsid', args.osd_fsid)
+
         cluster_name = osd_metadata.get('cluster_name', 'ceph')
         osd_dir = '/var/lib/ceph/osd/%s-%s' % (cluster_name, osd_id)
         data_uuid = osd_metadata.get('data', {}).get('uuid')