]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-mon: only care about public addr during pick_addresses()
authorJoao Eduardo Luis <joao.luis@inktank.com>
Mon, 6 May 2013 15:51:30 +0000 (16:51 +0100)
committerJoao Eduardo Luis <joao.luis@inktank.com>
Wed, 22 May 2013 16:57:38 +0000 (17:57 +0100)
Fixes: #4228
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
src/ceph_mon.cc

index 541c239ef98f79ce5c8ba13d89122dafc8d59ae9..3eaa875c83d12d0a072b5b1a4e8bfbd923416bf0 100644 (file)
@@ -164,7 +164,7 @@ int main(int argc, const char **argv)
   // -- mkfs --
   if (mkfs) {
     // resolve public_network -> public_addr
-    pick_addresses(g_ceph_context);
+    pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
 
     common_init_finish(g_ceph_context);
 
@@ -419,7 +419,7 @@ int main(int argc, const char **argv)
   } else {
     dout(0) << g_conf->name << " does not exist in monmap, will attempt to join an existing cluster" << dendl;
 
-    pick_addresses(g_ceph_context);
+    pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
     if (!g_conf->public_addr.is_blank_ip()) {
       ipaddr = g_conf->public_addr;
       if (ipaddr.get_port() == 0)