RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/pull/10514/head'

Browse Source 
* upstream/pull/10514/head:
  src/vstart.sh: stop script aborting when ceph.cfg is not there

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2016-07-30 16:33:29 -04:00
commit 9bef6cf85a
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vstart.sh
View File

@ -290,7 +290,7 @@ 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
rm -- "$conf_fn"
[ -e "$conf_fn" ] && rm -- "$conf_fn"
fi
if [ "$start_all" -eq 1 ]; then