From aa0444cbdacbf5ceb7cdc75378a049c7b6154932 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Wed, 6 Mar 2019 16:19:46 +0800 Subject: [PATCH] vstart.sh: improve readability of ceph-conf for default op:lookup The default operation os ceph-conf is --lookup option. Add it obviously to enhance its readiness. Signed-off-by: Changcheng Liu --- src/vstart.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index aa4c4d1c45306..190f0e0426e6b 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -391,15 +391,15 @@ fi if [ "$overwrite_conf" -eq 0 ]; then CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf -c $conf_fn --show-config-value admin_socket)` mkdir -p $CEPH_ASOK_DIR - MON=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mon 2>/dev/null` && \ + MON=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC --lookup num_mon 2>/dev/null` && \ CEPH_NUM_MON="$MON" - OSD=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_osd 2>/dev/null` && \ + OSD=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC --lookup num_osd 2>/dev/null` && \ CEPH_NUM_OSD="$OSD" - MDS=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mds 2>/dev/null` && \ + MDS=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC --lookup num_mds 2>/dev/null` && \ CEPH_NUM_MDS="$MDS" - MGR=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mgr 2>/dev/null` && \ + MGR=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC --lookup num_mgr 2>/dev/null` && \ CEPH_NUM_MGR="$MGR" - RGW=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_rgw 2>/dev/null` && \ + RGW=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC --lookup num_rgw 2>/dev/null` && \ CEPH_NUM_RGW="$RGW" else if [ "$new" -ne 0 ]; then -- 2.39.5