From: Matt Benjamin <mbenjamin@redhat.com>
Date: Mon, 12 Sep 2022 21:00:49 +0000 (-0400)
Subject: rgw/main: if !nfs, register service map as "rgw"
X-Git-Tag: v18.0.0~56^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0a5debf8215e0507a58d4a862b49eb21467ae970;p=ceph-ci.git

rgw/main: if !nfs, register service map as "rgw"

This was accidentally changed to "nfs"--which breaks various
ceph orchestration assumptions.

Found by Ernesto Puerta <epuertat@redhat.com>

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 6719de12ddb..3f548e0e041 100644
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -477,7 +477,7 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
     fes.push_back(fe);
   }
 
-  std::string daemon_type = (nfs) ? "rgw-nfs" : "nfs";
+  std::string daemon_type = (nfs) ? "rgw-nfs" : "rgw";
   r = store->register_to_service_map(dpp, daemon_type, service_map_meta);
   if (r < 0) {
     derr << "ERROR: failed to register to service map: " << cpp_strerror(-r) << dendl;