]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook: Added missing `rgw` daemons in `service ls` 27864/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Apr 2019 11:17:29 +0000 (13:17 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 29 Apr 2019 13:27:16 +0000 (15:27 +0200)
Fixes: http://tracker.ceph.com/issues/39171
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 39984cf08f1dec0c0234e88afe8e8a56973eef7a)

src/pybind/mgr/rook/module.py

index 23e2dd6ec4c34dc578c102c5f3ae36c1c7084c37..2978b11b76a065f5105da3519a6e5bd0ddc14685 100644 (file)
@@ -370,6 +370,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