ceph_common.sh: fix iteration of items in ceph.conf

This broke in c8f528a4070dd3aa0b25c435c6234032aee39b21.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 47a21af85bd7dcbd81d0ca555a2a6178d84e38a3..af2576b3cd49726d5189e7c7742ebcbe65b27d73 100644 (file)
--- 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