diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-21 17:29:58 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-21 17:30:06 -0800 |
| commit | dd007db3ca27627d6a3017c436b6745084288ee5 (patch) | |
| tree | 92c610a3999c6406d43c96957a8804b90445d589 | |
| parent | 6bd8781dda524f04bb56bcdac5aa5b13ba61b07d (diff) | |
| download | ceph-dd007db3ca27627d6a3017c436b6745084288ee5.tar.gz | |
ceph_common.sh: fix iteration of items in ceph.conf
This broke in c8f528a4070dd3aa0b25c435c6234032aee39b21.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/ceph_common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ceph_common.sh b/src/ceph_common.sh index 47a21af85bd..af2576b3cd4 100644 --- a/src/ceph_common.sh +++ b/src/ceph_common.sh @@ -144,7 +144,7 @@ get_local_name_list() { } get_name_list() { - orig=$1 + orig="$*" # extract list of monitors, mdss, osds defined in startup.conf allconf=`$CCONF -c $conf -l mon | egrep -v '^mon$' ; \ @@ -162,14 +162,14 @@ get_name_list() { id=`echo $f | cut -c 4- | sed 's/\\.//'` case $f in mon | osd | mds) - what=`echo $allconf $local | grep ^$type || true` + what="$what "`echo "$allconf" "$local" | grep ^$type || true` ;; *) if ! echo " " $allconf $local " " | egrep -q "( $type$id | $type.$id )"; then echo "$0: $type.$id not found ($conf defines" $allconf", /var/lib/ceph defines" $local")" exit 1 fi - what="$f" + what="$what $f" ;; esac done |