Merge pull request #8251 from majianpeng/vstart

vstart: make -k with optional mon_num.

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

src/vstart.sh

@@ -275,6 +275,13 @@ esac
 shift
 done
 
+if [ "$overwrite_conf" -eq 0 ]; then
+  CEPH_NUM_MON=`awk -F= '/CEPH_NUM_MON/{print $2}' $conf_fn`
+  CEPH_NUM_OSD=`awk -F= '/CEPH_NUM_OSD/{print $2}' $conf_fn`
+  CEPH_NUM_MDS=`awk -F= '/CEPH_NUM_MDS/{print $2}' $conf_fn`
+  CEPH_NUM_RGW=`awk -F= '/CEPH_NUM_RGW/{print $2}' $conf_fn`
+fi
+
 if [ "$start_all" -eq 1 ]; then
 	start_mon=1
 	start_mds=1
@@ -436,6 +443,10 @@ if [ "$start_mon" -eq 1 ]; then
 		if [ $overwrite_conf -eq 1 ]; then
 		        cat <<EOF > $conf_fn
 ; generated by vstart.sh on `date`
+; CEPH_NUM_MON=$CEPH_NUM_MON
+; CEPH_NUM_OSD=$CEPH_NUM_OSD
+; CEPH_NUM_MDS=$CEPH_NUM_MDS
+; CEPH_NUM_RGW=$CEPH_NUM_RGW
 [global]
         fsid = $(uuidgen)
         osd pg bits = 3