mirror of
https://github.com/ceph/ceph
synced 2025-01-11 05:29:51 +00:00
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>
This commit is contained in:
parent
28758235ba
commit
0a5debf821
@ -477,7 +477,7 @@ int rgw::AppMain::init_frontends2(RGWLib* rgwlib)
|
|||||||
fes.push_back(fe);
|
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);
|
r = store->register_to_service_map(dpp, daemon_type, service_map_meta);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
derr << "ERROR: failed to register to service map: " << cpp_strerror(-r) << dendl;
|
derr << "ERROR: failed to register to service map: " << cpp_strerror(-r) << dendl;
|
||||||
|
Loading…
Reference in New Issue
Block a user