RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart.sh: only delete conf if -n

Browse Source 
src/test/ceph_objectstore_tool.py depends on an implicit "-k" when not
creating a new cluster. (Deleting the conf file without -n makes no
sense anyway.)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2016-08-02 14:13:18 -04:00
parent 4d95e5c00e
commit c3ca7ad40c
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vstart.sh
View File

@ -290,7 +290,13 @@ if [ "$overwrite_conf" -eq 0 ]; then
RGW=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_rgw 2>/dev/null` && \
CEPH_NUM_RGW="$RGW"
else
[ -e "$conf_fn" ] && rm -- "$conf_fn"
if [ "$new" -ne 0 ]; then
# only delete if -n
[ -e "$conf_fn" ] && rm -- "$conf_fn"
else
# -k is implied... (doesn't make sense otherwise)
overwrite_conf=0
fi
fi
if [ "$start_all" -eq 1 ]; then