diff options
| author | Jianpeng Ma <jianpeng.ma@intel.com> | 2018-03-19 18:14:41 +0100 |
|---|---|---|
| committer | Jianpeng Ma <jianpeng.ma@intel.com> | 2018-03-19 18:14:41 +0100 |
| commit | f437598cfcabbd66c372bc8ed2cbfdf440633080 (patch) | |
| tree | d7dca1b79c0c84a858fe04fe013f774be26b0054 /src/vstart.sh | |
| parent | Merge pull request #19811 from neha-ojha/wip-async-recovery (diff) | |
| download | ceph-f437598cfcabbd66c372bc8ed2cbfdf440633080.tar.xz ceph-f437598cfcabbd66c372bc8ed2cbfdf440633080.zip | |
stop.sh: specify the ceph.conf path to avoid using wrong ceph.conf.
Also specify the ceph.conf path for ceph-conf command in vstart.sh.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Diffstat (limited to 'src/vstart.sh')
| -rwxr-xr-x | src/vstart.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vstart.sh b/src/vstart.sh index 4760534ee95..5db01870719 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -325,7 +325,7 @@ if [ $kill_all -eq 1 ]; then fi if [ "$overwrite_conf" -eq 0 ]; then - CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf --show-config-value admin_socket)` + 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` && \ CEPH_NUM_MON="$MON" @@ -340,7 +340,7 @@ if [ "$overwrite_conf" -eq 0 ]; then else if [ "$new" -ne 0 ]; then # only delete if -n - asok_dir=`dirname $($CEPH_BIN/ceph-conf --show-config-value admin_socket)` + asok_dir=`dirname $($CEPH_BIN/ceph-conf -c $conf_fn --show-config-value admin_socket)` if [ $asok_dir != /var/run/ceph ]; then [ -d $asok_dir ] && rm -f $asok_dir/* && rmdir $asok_dir fi @@ -349,7 +349,7 @@ else fi [ -e "$conf_fn" ] && rm -- "$conf_fn" else - CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf --show-config-value admin_socket)` + CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf -c $conf_fn --show-config-value admin_socket)` # -k is implied... (doesn't make sense otherwise) overwrite_conf=0 fi |