From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 10 Apr 2019 11:17:29 +0000 (+0200)
Subject: mgr/rook: Added missing `rgw` daemons in `service ls`
X-Git-Tag: v15.1.0~2936^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39984cf08f1dec0c0234e88afe8e8a56973eef7a;p=ceph.git

mgr/rook: Added missing `rgw` daemons in `service ls`

Fixes: http://tracker.ceph.com/issues/39171
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index ec96f34679ea..f99da1436209 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