]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45964 from adk3798/pacific-raw-osd
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 25 May 2022 13:33:09 +0000 (09:33 -0400)
committerGitHub <noreply@github.com>
Wed, 25 May 2022 13:33:09 +0000 (09:33 -0400)
pacific: mgr/cephadm: Raw OSD Support

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
1  2 
src/ceph-volume/ceph_volume/devices/lvm/batch.py
src/ceph-volume/ceph_volume/devices/lvm/common.py
src/ceph-volume/ceph_volume/devices/lvm/zap.py
src/ceph-volume/ceph_volume/util/arg_validators.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator/module.py

index d6a77f136fdc78eff22ef2d806f6bad09585a567,837133dd0e5b16b627192cad72a4d99e1f6d3540..270c8a64879b664ec4ab95ca14b6d9e82a30db52
@@@ -1,14 -1,10 +1,13 @@@
  import argparse
  import os
- from ceph_volume import terminal
- from ceph_volume import decorators
- from ceph_volume.util import disk
+ from ceph_volume import terminal, decorators, process
  from ceph_volume.util.device import Device
+ from ceph_volume.util import disk
  
  
 +def valid_osd_id(val):
 +    return str(int(val))
 +
  class ValidDevice(object):
  
      def __init__(self, as_string=False, gpt_ok=False):
Simple merge