From: John Spray <john.spray@redhat.com>
Date: Wed, 9 Aug 2017 11:06:36 +0000 (-0400)
Subject: mgr: add missing call to pick_addresses
X-Git-Tag: v12.2.0~35^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17173%2Fhead;p=ceph.git

mgr: add missing call to pick_addresses

Previously this was presumably simply not
applying the public_network setting at all.

Fixes: http://tracker.ceph.com/issues/20955
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 33fe08dd39342ab7d6f6bc60d7cefbe5af1a0a3d)
---

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index 6b72cf2f9bd8d..91043f6e81628 100644
--- a/src/ceph_mgr.cc
+++ b/src/ceph_mgr.cc
@@ -20,6 +20,7 @@
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "common/errno.h"
+#include "common/pick_address.h"
 #include "global/global_init.h"
 
 #include "mgr/MgrStandby.h"
@@ -52,6 +53,8 @@ int main(int argc, const char **argv)
     usage();
   }
 
+  pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
+
   global_init_daemonize(g_ceph_context);
   global_init_chdir(g_ceph_context);
   common_init_finish(g_ceph_context);