From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 16:42:58 +0000 (-0600)
Subject: vstart.sh: put mon addrs in mon_host, not 'mon addr'
X-Git-Tag: v14.1.0~484^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1aec88c9f08ab1cf5fbf1e0dfc84ebbc84faef9;p=ceph.git

vstart.sh: put mon addrs in mon_host, not 'mon addr'

Notably, mon addr won't take an addrvec, while everything else will.

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

diff --git a/src/vstart.sh b/src/vstart.sh
index a60b19972a40..a53f5d65920b 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -682,6 +682,7 @@ start_mon() {
 		# build a fresh fs monmap, mon fs
 		local str=""
 		local count=0
+		local mon_host=""
 		for f in $MONS
 		do
 		    if [ $msgr -eq 1 ]; then
@@ -694,14 +695,18 @@ start_mon() {
 			A="v2:$IP:$(($CEPH_PORT+$count)),v1:$IP:$(($CEPH_PORT+$count+1))"
 		    fi
 		    str="$str --addv $f $A"
+		    mon_host="$mon_host $A"
 		    wconf <<EOF
 [mon.$f]
         host = $HOSTNAME
         mon data = $CEPH_DEV_DIR/mon.$f
-        mon addr = $A
 EOF
 		    count=$(($count + 2))
 		done
+		wconf <<EOF
+[global]
+        mon host = $mon_host
+EOF
 		prun "$CEPH_BIN/monmaptool" --create --clobber $str --print "$monmap_fn"
 
 		for f in $MONS