summaryrefslogtreecommitdiff
path: root/src/mkcephfs.in
diff options
context:
space:
mode:
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-02-07 03:24:38 -0800
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-02-07 04:34:53 -0800
commitaa8a25592f442ab640708115e144e6b8d95cb664 (patch)
treeeee72043e84cb7fca2d86cb6c331b124bc8cd4c4 /src/mkcephfs.in
parent071159991d8791233584ad87bae8ea8cd6211880 (diff)
downloadceph-aa8a25592f442ab640708115e144e6b8d95cb664.tar.gz
mkcephfs: fix bug in multi-node setups
mkcephfs needs to create $TDIR on the other nodes in a multi-node setup before trying to scp files into that directory. Also, do mkdir -p on the directory where the configuration is going to go. Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Diffstat (limited to 'src/mkcephfs.in')
-rw-r--r--src/mkcephfs.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 5a4f29fc7f7..a754165f49b 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -189,6 +189,9 @@ for name in $what; do
check_host || continue
if [ -n "$ssh" ] && ( echo $pushed_to | grep -v -q " $host " ); then
+ conf_dir=`dirname "$conf"`
+ ssh $host mkdir -p "$conf_dir"
+ ssh $host mkdir -p "$TDIR"
scp -q $conf $host:$conf
scp -q $osdmap $host:$osdmap
scp -q $monmap $host:$monmap
@@ -279,7 +282,9 @@ for name in $what; do
fi
rm -f $TDIR/keyring.mds.$id
fi
-
+ if [ -n "$ssh" ]; then
+ ssh $host rm -rf $TDIR
+ fi
done
rm -f $monkeyring