From: Sage Weil <sage@newdream.net>
Date: Wed, 23 Nov 2011 00:28:42 +0000 (-0800)
Subject: mon: pick_addresses before common_init_finish
X-Git-Tag: v0.39~17^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9870e2f77bc09e319f0d9a1e8a5e642a6b342970;p=ceph-ci.git

mon: pick_addresses before common_init_finish

We can't modify g_conf->public_addr after that.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 9da2d44fa09..5c46a367f05 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -99,6 +99,9 @@ int main(int argc, const char **argv)
 
   // -- mkfs --
   if (mkfs) {
+    // resolve public_network -> public_addr
+    pick_addresses(g_ceph_context);
+
     common_init_finish(g_ceph_context);
 
     bufferlist monmapbl, osdmapbl;
@@ -127,9 +130,6 @@ int main(int argc, const char **argv)
 	exit(1);
       }
       
-      // resolve public_network -> public_addr
-      pick_addresses(g_ceph_context);
-      
       // am i part of the initial quorum?
       if (monmap.contains(g_conf->name.get_id())) {
 	// hmm, make sure the ip listed exists on the current host?