]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32261 into master
authorSage Weil <sage@redhat.com>
Sun, 22 Dec 2019 01:59:37 +0000 (19:59 -0600)
committerSage Weil <sage@redhat.com>
Sun, 22 Dec 2019 01:59:37 +0000 (19:59 -0600)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator.py

Simple merge
index 04287da7e30ff65c5760522a68f313707c9698d8,6cda1902dc525a048c451c6ddc447ff049ae13fb..7ccdcaf0e86c5ffc38068a1a2a3bcb37722e9553
@@@ -230,6 -211,5 +230,6 @@@ class TestCephadm(object)
      @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
      def test_blink_device_light(self, _send_command, _get_connection, cephadm_module):
          with self._with_host(cephadm_module, 'test'):
-             c = cephadm_module.blink_device_light('ident', True, [('test', '')])
+             c = cephadm_module.blink_device_light('ident', True, [('test', '', '')])
              assert self._wait(cephadm_module, c) == ['Set ident light for test: on']
 +
Simple merge