Skip to content

Commit c4625d8

Browse files
python-common: Reference it in the docs
Signed-off-by: Sebastian Wagner <[email protected]>
1 parent 74977b1 commit c4625d8

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

doc/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def __getattr__(cls, name):
106106
sys.modules['ceph_module'] = Mock()
107107

108108
for pybind in [os.path.join(top_level, 'src/pybind'),
109-
os.path.join(top_level, 'src/pybind/mgr')]:
109+
os.path.join(top_level, 'src/pybind/mgr'),
110+
os.path.join(top_level, 'src/python-common')]:
110111
if pybind not in sys.path:
111112
sys.path.insert(0, pybind)

doc/mgr/orchestrator_cli.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ Create OSDs on a group of devices on a single host::
149149

150150
The output of ``osd create`` is not specified and may vary between orchestrator backends.
151151

152-
Where ``drive.group.json`` is a JSON file containing the fields defined in :class:`orchestrator.DriveGroupSpec`
152+
Where ``drive.group.json`` is a JSON file containing the fields defined in
153+
:class:`ceph.deployment_utils.drive_group.DriveGroupSpec`
153154

154155
Example::
155156

doc/mgr/orchestrator_modules.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,17 @@ OSD management
250250
.. automethod:: Orchestrator.replace_osds
251251
.. automethod:: Orchestrator.remove_osds
252252

253+
.. py:currentmodule:: ceph.deployment.drive_group
254+
253255
.. autoclass:: DeviceSelection
254256
:members:
255257

256258
.. autoclass:: DriveGroupSpec
257259
:members:
258260
:exclude-members: from_json
259261

262+
.. py:currentmodule:: orchestrator
263+
260264
Stateless Services
261265
------------------
262266

src/python-common/ceph/deployment/drive_group.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ def from_json(cls, device_spec):
5555

5656

5757
class DriveGroupValidationError(Exception):
58-
"""
59-
Defining an exception here is a bit problematic, cause you cannot properly catch it,
60-
if it was raised in a different mgr module.
61-
"""
62-
6358
def __init__(self, msg):
6459
super(DriveGroupValidationError, self).__init__('Failed to validate Drive Group: ' + msg)
6560

0 commit comments

Comments
 (0)