From 73e714357d898a06b7bb172691a0dbe360f0f535 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 11 Jan 2018 13:11:31 -0600 Subject: [PATCH] ceph-volume: adds crush_device_class to json metadata for 'osd new' Signed-off-by: Andrew Schoen (cherry picked from commit 3404d8bba503f3f74f411b11108d39cb626d3bed) --- src/ceph-volume/ceph_volume/devices/lvm/prepare.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py index ad559e4ce6d70..c8c323053e896 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py @@ -189,6 +189,9 @@ class Prepare(object): cluster_fsid = conf.ceph.get('global', 'fsid') osd_fsid = args.osd_fsid or system.generate_uuid() + crush_device_class = args.crush_device_class + if crush_device_class: + secrets['crush_device_class'] = crush_device_class # allow re-using an id, in case a prepare failed self.osd_id = args.osd_id or prepare_utils.create_id(osd_fsid, json.dumps(secrets)) tags = { @@ -196,7 +199,7 @@ class Prepare(object): 'ceph.osd_id': self.osd_id, 'ceph.cluster_fsid': cluster_fsid, 'ceph.cluster_name': conf.cluster, - 'ceph.crush_device_class': args.crush_device_class, + 'ceph.crush_device_class': crush_device_class, } if args.filestore: if not args.journal: -- 2.39.5