]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
python-common: don't assert when building rados url
authorMichael Fritch <mfritch@suse.com>
Thu, 30 Jul 2020 17:34:33 +0000 (11:34 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 4 Aug 2020 14:21:44 +0000 (16:21 +0200)
breaks the `orch ls --format yaml` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 26aa14820196143c25d57b4d5517adf6500b19f9)

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

index 4508430b319205fe0dbecd846d9ed7901cc4a993..6763572e0433bddd88fe809cbc9d6e73dbea5f59 100644 (file)
@@ -599,11 +599,12 @@ class NFSServiceSpec(ServiceSpec):
 
     def rados_config_location(self):
         # type: () -> str
-        assert self.pool
-        url = 'rados://' + self.pool + '/'
-        if self.namespace:
-            url += self.namespace + '/'
-        url += self.rados_config_name()
+        url = ''
+        if self.pool:
+            url += 'rados://' + self.pool + '/'
+            if self.namespace:
+                url += self.namespace + '/'
+            url += self.rados_config_name()
         return url