From 26aa14820196143c25d57b4d5517adf6500b19f9 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 30 Jul 2020 11:34:33 -0600 Subject: [PATCH] python-common: don't assert when building rados url breaks the `orch ls --format yaml` command Signed-off-by: Michael Fritch --- src/python-common/ceph/deployment/service_spec.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index efbc512106d..45d80bf754e 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -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 -- 2.39.5