From: Kefu Chai <kchai@redhat.com>
Date: Thu, 3 Jun 2021 10:38:08 +0000 (+0800)
Subject: vstart.sh: extract create_mgr_restful_secret() out
X-Git-Tag: v17.1.0~1756^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3dd9d51a5990c3c05dd4cf482202d3218217afc;p=ceph.git

vstart.sh: extract create_mgr_restful_secret() out

for better readability, and so it's easier to make this step optional if
developer is not interested in using the restful mgr module.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index b2831ee080f04..cff08910ad518 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -970,6 +970,22 @@ EOF
     fi
 }
 
+create_mgr_restful_secret() {
+    while ! ceph_adm -h | grep -c -q ^restful ; do
+        debug echo 'waiting for mgr restful module to start'
+        sleep 1
+    done
+    local secret_file
+    if ceph_adm restful create-self-signed-cert > /dev/null; then
+        secret_file=`mktemp`
+        ceph_adm restful create-key admin -o $secret_file
+        RESTFUL_SECRET=`cat $secret_file`
+        rm $secret_file
+    else
+        debug echo MGR Restful is not working, perhaps the package is not installed?
+    fi
+}
+
 start_mgr() {
     local mgr=0
     local ssl=${DASHBOARD_SSL:-1}
@@ -1040,19 +1056,7 @@ EOF
                 fi
             fi
         fi
-
-        while ! ceph_adm -h | grep -c -q ^restful ; do
-            debug echo 'waiting for mgr restful module to start'
-            sleep 1
-        done
-        if ceph_adm restful create-self-signed-cert; then
-            SF=`mktemp`
-            ceph_adm restful create-key admin -o $SF
-            RESTFUL_SECRET=`cat $SF`
-            rm $SF
-        else
-            debug echo MGR Restful is not working, perhaps the package is not installed?
-        fi
+        create_mgr_restful_secret
     fi
 
     if [ "$cephadm" -eq 1 ]; then