]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart.sh: force setting dashboard options before first mgr starts 25756/head
authorSage Weil <sage@redhat.com>
Wed, 2 Jan 2019 22:29:44 +0000 (16:29 -0600)
committerSage Weil <sage@redhat.com>
Thu, 3 Jan 2019 13:10:12 +0000 (07:10 -0600)
These options are unknown before the mgr first starts and registers them.

Signed-off-by: Sage Weil <sage@redhat.com>
src/vstart.sh

index e72d8c61c1ac84267ee1c42ab3fccad27bc0e208..cbd38dd42ab0d31b01082c5c4df5c7a37b539915 100755 (executable)
@@ -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