mgr/rook: describe_services: name rgw svc appropriately

Set rgw_zone if present.  Do not set rgw_realm because we don't
know what it is from the CephObjectstore CRD.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 5a7f177d3a7bda2b5192c2da2c3264dda9ac6717..cea5ad8ef283566b54a906d1159be003dbfbf7bf 100644 (file)
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -299,9 +299,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             # CephObjectstores
             all_zones = self.rook_cluster.get_resource("cephobjectstores")
             for zone in all_zones:
-                rgw_realm = zone['metadata']['name']
-                rgw_zone = rgw_realm
-                svc = 'rgw.' + rgw_realm
+                svc = 'rgw.' + zone['metadata']['name']
                 if svc in spec:
                     continue
                 active = zone['spec']['gateway']['instances'];
@@ -311,10 +309,10 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
                 else:
                     ssl = False
                     port = zone['spec']['gateway']['port'] or 80
+                rgw_zone = zone['spec'].get('zone', {}).get('name') or None
                 spec[svc] = orchestrator.ServiceDescription(
                     spec=RGWSpec(
                         service_id=zone['metadata']['name'],
-                        rgw_realm=rgw_realm,
                         rgw_zone=rgw_zone,
                         ssl=ssl,
                         rgw_frontend_port=port,