From: Kefu Chai <kchai@redhat.com>
Date: Sun, 11 Feb 2018 03:46:25 +0000 (+0800)
Subject: vstart.sh: add comma in DASH_URLS and RESTFUL_URLS
X-Git-Tag: v13.0.2~257^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=936e720c010ea737c337b2d9adf723de3af2ac14;p=ceph.git

vstart.sh: add comma in DASH_URLS and RESTFUL_URLS

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 8d4e7a579381..6324469453a3 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -678,14 +678,21 @@ start_mgr() {
         host = $HOSTNAME
 EOF
 
-	ceph_adm config-key set mgr/dashboard/$name/server_port $MGR_PORT
-	DASH_URLS+="http://$IP:$MGR_PORT/"
-	MGR_PORT=$(($MGR_PORT + 1000))
-
-	ceph_adm config-key set mgr/restful/$name/server_port $MGR_PORT
+        ceph_adm config-key set mgr/dashboard/$name/server_port $MGR_PORT
+        if [ $mgr -eq 1 ]; then
+            DASH_URLS="http://$IP:$MGR_PORT"
+        else
+            DASH_URLS+=", http://$IP:$MGR_PORT"
+        fi
+        MGR_PORT=$(($MGR_PORT + 1000))
 
-	RESTFUL_URLS+="https://$IP:$MGR_PORT"
-	MGR_PORT=$(($MGR_PORT + 1000))
+        ceph_adm config-key set mgr/restful/$name/server_port $MGR_PORT
+        if [ $mgr -eq 1 ]; then
+            RESTFUL_URLS="https://$IP:$MGR_PORT"
+        else
+            RESTFUL_URLS+=", https://$IP:$MGR_PORT"
+        fi
+        MGR_PORT=$(($MGR_PORT + 1000))
 
         echo "Starting mgr.${name}"
         run 'mgr' $CEPH_BIN/ceph-mgr -i $name $ARGS