]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: add comma in DASH_URLS and RESTFUL_URLS
authorKefu Chai <kchai@redhat.com>
Sun, 11 Feb 2018 03:46:25 +0000 (11:46 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 11 Feb 2018 06:25:37 +0000 (14:25 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/vstart.sh

index 8d4e7a579381debc1f40cf82d8847c58d55ede00..6324469453a33deb9414e15eeea60b95b351ce24 100755 (executable)
@@ -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