summaryrefslogtreecommitdiffstats
path: root/src/vstart.sh
diff options
context:
space:
mode:
authorJohn Spray <john.spray@redhat.com>2018-04-24 21:05:44 +0200
committerJohn Spray <john.spray@redhat.com>2018-04-27 15:58:46 +0200
commitf521ffdb9089d920b155ae3464eb50f3cff8034e (patch)
treede342b562002079cba1b161a9e06c115d3f79936 /src/vstart.sh
parentmgr/dashboard: enable TLS (diff)
downloadceph-f521ffdb9089d920b155ae3464eb50f3cff8034e.tar.xz
ceph-f521ffdb9089d920b155ae3464eb50f3cff8034e.zip
vstart: update for dashboard TLS
Signed-off-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'src/vstart.sh')
-rwxr-xr-xsrc/vstart.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vstart.sh b/src/vstart.sh
index e201ffce0fa..ab316efeff0 100755
--- 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