vstart: update for dashboard TLS

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index e201ffce0fad9c0baafc72006818f3f378894ed7..ab316efeff04f3c5c0b71b7e9ed5f51dc3d3e4d1 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -686,9 +686,9 @@ EOF
         if $with_mgr_dashboard ; then
             ceph_adm config set mgr mgr/dashboard/$name/server_port $MGR_PORT
             if [ $mgr -eq 1 ]; then
-                DASH_URLS="http://$IP:$MGR_PORT"
+                DASH_URLS="https://$IP:$MGR_PORT"
             else
-                DASH_URLS+=", http://$IP:$MGR_PORT"
+                DASH_URLS+=", https://$IP:$MGR_PORT"
             fi
         fi
        MGR_PORT=$(($MGR_PORT + 1000))
@@ -711,6 +711,9 @@ EOF
     # setting login credentials for dashboard
     if $with_mgr_dashboard; then
         ceph_adm tell mgr dashboard set-login-credentials admin admin
+        if ! ceph_adm tell mgr dashboard create-self-signed-cert;  then
+            echo dashboard module not working correctly!
+        fi
     fi
 
     if ceph_adm tell mgr restful create-self-signed-cert; then