From 7f92d370a387a5bb29cac37948d2f9160b7bf900 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Jun 2011 09:51:22 -0700 Subject: [PATCH] osd: warn instead of error if cluster addr specified but not public addr Signed-off-by: Sage Weil --- src/cosd.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/cosd.cc b/src/cosd.cc index 73b79dd0470b9..cd4048ffad5e0 100644 --- a/src/cosd.cc +++ b/src/cosd.cc @@ -213,16 +213,11 @@ int main(int argc, const char **argv) exit(1); } - bool client_addr_set = !g_conf->public_addr.is_blank_addr(); - bool cluster_addr_set = !g_conf->cluster_addr.is_blank_addr(); - - if (cluster_addr_set && !client_addr_set) { - derr << TEXT_RED << " ** " - << "WARNING: set cluster address but not client address!" << " **\n" - << "using cluster address for clients" << TEXT_NORMAL << dendl; - g_conf->public_addr = g_conf->cluster_addr; - client_addr_set = true; - cluster_addr_set = false; + if (g_conf->public_addr.is_blank_addr() && !g_conf->cluster_addr.is_blank_addr()) { + derr << TEXT_YELLOW + << " ** WARNING: specified cluster addr but not public addr; we recommend **\n" + << " ** you specify neither or both. **" + << TEXT_NORMAL << dendl; } SimpleMessenger *client_messenger = new SimpleMessenger(&g_ceph_context); -- 2.39.5