]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/nfs: allow multiple addrs for new exports
authorSage Weil <sage@newdream.net>
Mon, 7 Jun 2021 20:45:29 +0000 (16:45 -0400)
committerSebastian Wagner <sewagner@redhat.com>
Thu, 9 Sep 2021 14:17:48 +0000 (16:17 +0200)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit aaa57afd2930b6dafcf4dde4e2d939c428d290f4)

src/pybind/mgr/nfs/module.py

index aa4ae6385c3d5fdec1d1fe680261bd006175b70f..c4cda93214a7d1eb5570fa14ed982eb83cf6fa4d 100644 (file)
@@ -32,14 +32,14 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
             binding: str,
             path: Optional[str] = '/',
             readonly: Optional[bool] = False,
-            addr: Optional[str] = None,
+            addr: Optional[List[str]] = None,
             squash: str = 'none',
     ) -> Tuple[int, str, str]:
         """Create a cephfs export"""
         clients = []
         if addr:
             clients = [{
-                'addresses': [addr],
+                'addresses': addr,
                 'access_type': 'ro' if readonly else 'rw',
                 'squash': squash,
             }]
@@ -56,7 +56,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
             cluster_id: str,
             binding: str,
             readonly: Optional[bool] = False,
-            addr: Optional[str] = None,
+            addr: Optional[List[str]] = None,
             realm: Optional[str] = None,
     ) -> Tuple[int, str, str]:
         """Create an RGW export"""
@@ -64,7 +64,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
         squash = 'none'
         if addr:
             clients = [{
-                'addresses': [addr],
+                'addresses': addr,
                 'access_type': 'ro' if readonly else 'rw',
                 'squash': squash,
             }]