summaryrefslogtreecommitdiffstats
path: root/src/pybind/mgr/orchestrator.py
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2019-12-22 02:59:37 +0100
committerSage Weil <sage@redhat.com>2019-12-22 02:59:37 +0100
commiteffe9c9a3f1c299f2f8ff19c98c572aad11c1f00 (patch)
tree4acd8787897c543c4364db4f88ec3ae2268bc8bd /src/pybind/mgr/orchestrator.py
parentMerge PR #32333 into master (diff)
parentmgr/orchestrator: use full device path for blinking lights (if available) (diff)
downloadceph-effe9c9a3f1c299f2f8ff19c98c572aad11c1f00.tar.xz
ceph-effe9c9a3f1c299f2f8ff19c98c572aad11c1f00.zip
Merge PR #32261 into master
* refs/pull/32261/head: mgr/orchestrator: use full device path for blinking lights (if available) mgr: report device by-path paths too common/blkdev: include by-path path for each device in metadata common/blkdev: factor get_device_metadata out of mon, osd Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Diffstat (limited to 'src/pybind/mgr/orchestrator.py')
-rw-r--r--src/pybind/mgr/orchestrator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 751c62517bc..c411dabcb5e 100644
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -1413,7 +1413,7 @@ class InventoryNode(object):
return self.name == other.name and self.devices == other.devices
-class DeviceLightLoc(namedtuple('DeviceLightLoc', ['host', 'dev'])):
+class DeviceLightLoc(namedtuple('DeviceLightLoc', ['host', 'dev', 'path'])):
"""
Describes a specific device on a specific host. Used for enabling or disabling LEDs
on devices.