From: Michael Fritch <mfritch@suse.com>
Date: Tue, 28 Jul 2020 17:24:21 +0000 (-0600)
Subject: vstart: infer the mon public_network
X-Git-Tag: v15.2.5~86^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a3fa83e0cc3a2fdd1d74c068e4fa2d49a2d8680;p=ceph.git

vstart: infer the mon public_network

set the mon public_network when deploying with the cephadm flag

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6442662bbe45af2591427e9522eef45604cebbfa)
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 1b914a841409..bbff220b1282 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1314,6 +1314,11 @@ mds_debug_scatterstat = true
 mds_verify_scatter = true
 EOF
     fi
+    if [ "$cephadm" -gt 0 ]; then
+        debug echo Setting mon public_network ...
+        public_network=$(ip route list | grep -w "$IP" | awk '{print $1}')
+        ceph_adm config set mon public_network $public_network
+    fi
 fi
 
 if [ $CEPH_NUM_MGR -gt 0 ]; then