From: Sage Weil <sage@redhat.com>
Date: Wed, 2 Jan 2019 22:29:44 +0000 (-0600)
Subject: vstart.sh: force setting dashboard options before first mgr starts
X-Git-Tag: v14.1.0~497^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8fceaf6f9dadf3eb39064f6d02831ad977a70d4;p=ceph.git

vstart.sh: force setting dashboard options before first mgr starts

These options are unknown before the mgr first starts and registers them.

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

diff --git a/src/vstart.sh b/src/vstart.sh
index e72d8c61c1ac..cbd38dd42ab0 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -743,7 +743,7 @@ start_mgr() {
 EOF
 
             if $with_mgr_dashboard ; then
-                ceph_adm config set mgr mgr/dashboard/$name/server_port $MGR_PORT
+                ceph_adm config set mgr mgr/dashboard/$name/server_port $MGR_PORT --force
                 if [ $mgr -eq 1 ]; then
                     DASH_URLS="https://$IP:$MGR_PORT"
                 else
@@ -752,7 +752,7 @@ EOF
             fi
 	    MGR_PORT=$(($MGR_PORT + 1000))
 
-	    ceph_adm config set mgr mgr/restful/$name/server_port $MGR_PORT
+	    ceph_adm config set mgr mgr/restful/$name/server_port $MGR_PORT --force
             if [ $mgr -eq 1 ]; then
                 RESTFUL_URLS="https://$IP:$MGR_PORT"
             else