]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/rook: Added missing `rgw` daemons in `service ls`
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Apr 2019 11:17:29 +0000 (13:17 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Apr 2019 11:17:29 +0000 (13:17 +0200)
Fixes: http://tracker.ceph.com/issues/39171
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/rook/module.py

index ec96f34679ea99e5d341680286a30e798f9b2c23..f99da1436209a0b160cf31e850ad2934407eabc3 100644 (file)
@@ -361,6 +361,9 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
                 sd.service = p['labels']['ceph_nfs']
                 sd.service_instance = p['labels']['instance']
                 sd.rados_config_location = self.rook_cluster.get_nfs_conf_url(sd.service, sd.service_instance)
+            elif sd.service_type == "rgw":
+                sd.service = p['labels']['rgw']
+                sd.service_instance = p['labels']['ceph_daemon_id']
             else:
                 # Unknown type -- skip it
                 continue