shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'bug-2271'

Browse Source 
Conflicts:
	src/datastore_mad/remotes/ceph/monitor
This commit is contained in:
Ruben S. Montero 2013-08-17 23:58:10 +02:00
commit 4c67a68b0a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datastore_mad/remotes/ceph/cp
View File

@ -120,7 +120,7 @@ REGISTER_CMD=$(cat <<EOF
set -e
# create rbd
$QEMU_IMG convert -O rbd $TMP_DST rbd:$RBD_SOURCE
$QEMU_IMG convert $TMP_DST rbd:$RBD_SOURCE
# remove original
$RM -f $TMP_DST

2
src/datastore_mad/remotes/ceph/mkfs
View File

@ -98,7 +98,7 @@ REGISTER_CMD=$(cat <<EOF
$MKFS_CMD
# create rbd
$QEMU_IMG convert -O rbd $TMP_DST rbd:$RBD_SOURCE
$QEMU_IMG convert $TMP_DST rbd:$RBD_SOURCE
# remove original
$RM -f $TMP_DST

2
src/datastore_mad/remotes/ceph/monitor
View File

@ -59,7 +59,7 @@ fi
# ------------ Compute datastore usage -------------
MONITOR_SCRIPT=$(cat <<EOF
$SUDO $RADOS $DF | $AWK '{
$RADOS df | $AWK '{
if (\$1 == "total") {
space = int(\$3/1024)