monmap: ignore conf mon entries when -m is specified

Use -m <addrs> instead of conf mons (instead of combining them into a
single large search pool).

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 4a112a5557acafa325f69b57e6813edf616267a5..ebff83763ae1dd4aa60ea4a1e4ad09b6c448f243 100644 (file)
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -262,6 +262,7 @@ int MonMap::build_initial(CephContext *cct, ostream& errout)
     int r = build_from_host_list(conf->mon_host, "noname-");
     if (r < 0)
       errout << "unable to parse addrs in '" << conf->mon_host << "'" << std::endl;
+    return 0;
   }
 
   // What monitors are in the config file?