From: Sage Weil <sage@newdream.net>
Date: Fri, 2 Jul 2021 18:43:56 +0000 (-0400)
Subject: python-common: don't accept pool/ns for NFSServiceSpec
X-Git-Tag: v17.1.0~1390^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d0d95db00d462cc8101311d591bda26dc452581f;p=ceph.git

python-common: don't accept pool/ns for NFSServiceSpec

All users are now gone.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 57e88cb8f73a0..e8c47b4e47b7f 100644
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -663,8 +663,6 @@ yaml.add_representer(ServiceSpec, ServiceSpec.yaml_representer)
 
 
 class NFSServiceSpec(ServiceSpec):
-    DEFAULT_POOL = '.nfs'
-
     def __init__(self,
                  service_type: str = 'nfs',
                  service_id: Optional[str] = None,
@@ -673,8 +671,6 @@ class NFSServiceSpec(ServiceSpec):
                  preview_only: bool = False,
                  config: Optional[Dict[str, str]] = None,
                  networks: Optional[List[str]] = None,
-                 pool: Optional[str] = None,
-                 namespace: Optional[str] = None,
                  port: Optional[int] = None,
                  ):
         assert service_type == 'nfs'
@@ -685,10 +681,6 @@ class NFSServiceSpec(ServiceSpec):
 
         self.port = port
 
-        # these fields are obsolete; remove from __init__ and this assert eventually.
-        assert pool is None or pool == self.DEFAULT_POOL
-        assert namespace is None or namespace == self.service_id
-
     def get_port_start(self) -> List[int]:
         if self.port:
             return [self.port]