From: Alfredo Deza Date: Wed, 8 Nov 2017 20:21:10 +0000 (-0500) Subject: ceph-volume simple.activate use the contents of the JSON file, fallback to CLI args X-Git-Tag: v12.2.2~23^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3af40c35f3cf42be722f9d905cb2d0ba2baf1b1b;p=ceph.git ceph-volume simple.activate use the contents of the JSON file, fallback to CLI args Signed-off-by: Alfredo Deza (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 e6959aa18060..06dbff4d21a1 100644 --- 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')