From 39984cf08f1dec0c0234e88afe8e8a56973eef7a Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 10 Apr 2019 13:17:29 +0200 Subject: [PATCH] mgr/rook: Added missing `rgw` daemons in `service ls` Fixes: http://tracker.ceph.com/issues/39171 Signed-off-by: Sebastian Wagner --- src/pybind/mgr/rook/module.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index ec96f34679e..f99da143620 100644 --- a/src/pybind/mgr/rook/module.py +++ b/src/pybind/mgr/rook/module.py @@ -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 -- 2.47.3