]> git.apps.os.sepia.ceph.com Git - ceph-ci.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)
committerMichael Fritch <mfritch@suse.com>
Thu, 30 Jul 2020 19:14:50 +0000 (13:14 -0600)
breaks the `orch ls --format yaml` command

Signed-off-by: Michael Fritch <mfritch@suse.com>
src/python-common/ceph/deployment/service_spec.py

index efbc512106d6e257672bc903805c74fc716f00cf..45d80bf754e22860211f08ee9e883abf8e804147 100644 (file)
@@ -598,11 +598,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