RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36807 from badone/wip-tracker-47002-legacy_vals-keyring

Browse Source 
common/config: Make sure legacy_values are updated

Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-08-27 12:40:58 +08:00 committed by GitHub
commit 031d363ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/config.cc
View File

@ -386,6 +386,7 @@ int md_config_t::parse_config_files(ConfigValues& values,
if (values.cluster.empty()) {
values.cluster = get_cluster_name(conffile.c_str());
}
update_legacy_vals(values);
return 0;
}
@ -418,7 +419,6 @@ md_config_t::parse_buffer(ConfigValues& values,
}
}
cf.check_old_style_section_names({"mds", "mon", "osd"}, cerr);
update_legacy_vals(values);
return 0;
}