From: Sage Weil <sage@newdream.net>
Date: Tue, 10 Aug 2021 20:47:34 +0000 (-0400)
Subject: Merge PR #42318 into master
X-Git-Tag: v17.1.0~1144
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bb9f33c9158b61a0561db2be07272a83e43af6f;p=ceph.git

Merge PR #42318 into master

* refs/pull/42318/head:
	mgr/rook: update DefaultFetcher device path to look at local and fix bug
	mgr/rook: add node and PV name information to Device in DefaultFetcher
	mgr/rook: fix typing errors in Fetcher classes
	mgr/rook: create and use DefaultFetcher and LSOFetcher classes
	mgr/rook: create KubernetesCustomResource class to fetch CRs
	mgr/rook: fix device ls error handling
	mgr/rook: change storage class module option name and default value
	mgr/rook: fix typing errors related to storage_class_name and device ls
	mgr/rook: make `device ls` only display pvs in specified storage class
	mgr/rook: add StorageV1Api and storage_class_name to RookCluster
	mgr/rook: add StorageV1Api to RookOrchestrator
	mgr/rook: add mgr/rook/storage_class_name to ceph config
	mgr/rook: ceph orch device ls fetch and display info about PVs
	mgr/rook: add CustomObjectsApi to RookCluster

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
---

5bb9f33c9158b61a0561db2be07272a83e43af6f
diff --cc src/pybind/mgr/rook/rook_cluster.py
index daefe7a73946,22dc661d5c43..8d8855918797
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@@ -23,10 -23,9 +23,10 @@@ from ceph.deployment.inventory import D
  from ceph.deployment.drive_group import DriveGroupSpec
  from ceph.deployment.service_spec import ServiceSpec, NFSServiceSpec, RGWSpec
  from ceph.utils import datetime_now
 +from mgr_module import NFS_POOL_NAME
  from mgr_util import merge_dicts
  
- from typing import Optional, TypeVar, List, Callable, Any, cast, Generic, \
+ from typing import Optional, Tuple, TypeVar, List, Callable, Any, cast, Generic, \
      Iterable, Dict, Iterator, Type
  
  try: