From 3c8dbd669a906623359d35337bacb5d1261b54c4 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 16 Aug 2013 12:00:36 -0400
Subject: [PATCH 1/2] Bug #2271: remove '-O rbd' from qemu-img

---
 src/datastore_mad/remotes/ceph/cp   | 2 +-
 src/datastore_mad/remotes/ceph/mkfs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index 82a295138f..992dbc50b7 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -115,7 +115,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
diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs
index e14404bf77..f58301544e 100755
--- a/src/datastore_mad/remotes/ceph/mkfs
+++ b/src/datastore_mad/remotes/ceph/mkfs
@@ -93,7 +93,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

From 72dc5e70a47cec6a0e14a37263fee160c4b2aca1 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 16 Aug 2013 12:00:50 -0400
Subject: [PATCH 2/2] Bug #2271: rados command doesn't need sudo

---
 src/datastore_mad/remotes/ceph/monitor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor
index 6ba8e9daad..4f14060760 100755
--- a/src/datastore_mad/remotes/ceph/monitor
+++ b/src/datastore_mad/remotes/ceph/monitor
@@ -54,7 +54,7 @@ POOL_NAME="${XPATH_ELEMENTS[1]:-$POOL_NAME}"
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
-$SUDO $RADOS df | $AWK '{
+$RADOS df | $AWK '{
     if (\$1 == "total") {
 
         space = int(\$3/1024)