mkcephfs: copy to daemon nodes for each daemon

The tmp directory is removed after each daemon.  Previously, this would
break if two daemons were on the same node.  Now, the files will be
copied for each daemon.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 89bf1fd9320e2866df5e4581c8a08b8098170474..ebcbb34939571bf5cb41f5f07ddc169b548c5dbd 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -389,12 +389,11 @@ if [ $allhosts -eq 1 ]; then
 
        check_host || continue
 
-       if [ -n "$ssh" ] && ( echo $pushed_to | grep -v -q " $host " ); then
+       if [ -n "$ssh" ]; then
            echo pushing conf and monmap to $host
            do_cmd "mkdir -p $rdir"
            scp -q $dir/conf $host:$rdir
            scp -q $dir/monmap $host:$rdir
-           pushed_to="$pushed_to $host "
        fi
        
        if [ $mkbtrfs -eq 1 ] && $type = "osd"; then
@@ -415,7 +414,6 @@ if [ $allhosts -eq 1 ]; then
     $0 -d $dir --prepare-mon $moreargs
     
     # mons
-    pushed_to=""
 
     get_name_list "mon"
     for name in $what; do
@@ -426,11 +424,10 @@ if [ $allhosts -eq 1 ]; then
 
        check_host || continue
        
-       if [ -n "$ssh" ] && ( echo $pushed_to | grep -v -q " $host " ); then
+       if [ -n "$ssh" ]; then
            echo pushing everything to $host
            ssh $host mkdir -p $rdir
            scp -q $dir/* $host:$rdir
-           pushed_to="$pushed_to $host "
        fi
        
        do_cmd "$0 -d $rdir --init-daemon $name"