From dde9cf317d70ee51f95796c536604f146d62bf8a Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Tue, 4 Jul 2017 18:42:51 +0200
Subject: [PATCH] F #5208: push down ceph_key to downloader to import rbd in
 marketplace

---
 src/datastore_mad/remotes/ceph/export   | 18 ++++++------------
 src/datastore_mad/remotes/downloader.sh |  6 ++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/export b/src/datastore_mad/remotes/ceph/export
index 51b969fef5..7d6dfc9426 100755
--- a/src/datastore_mad/remotes/ceph/export
+++ b/src/datastore_mad/remotes/ceph/export
@@ -77,29 +77,23 @@ if [ -z "$DST_HOST" ]; then
 fi
 
 IMPORT_SOURCE="rbd://$DST_HOST/$SRC"
+IS_JOIN="?"
 
 if [ -n "$CEPH_USER" ]; then
     RBD="$RBD --id ${CEPH_USER}"
-    IMPORT_SOURCE="${IMPORT_SOURCE}?CEPH_USER=${CEPH_USER}"
+    IMPORT_SOURCE="${IMPORT_SOURCE}${IS_JOIN}CEPH_USER=${CEPH_USER}"
+    IS_JOIN="&"
 fi
 
 if [ -n "$CEPH_KEY" ]; then
     RBD="$RBD --keyfile ${CEPH_USER}"
-    IMPORT_SOURCE="${IMPORT_SOURCE}?CEPH_USER=${CEPH_USER}?CEPH_KEY=${CEPH_KEY}?"
+    IMPORT_SOURCE="${IMPORT_SOURCE}${IS_JOIN}CEPH_KEY=${CEPH_KEY}"
+    IS_JOIN="&"
 fi
 
 if [ -n "$CEPH_CONF" ]; then
     RBD="$RBD --conf ${CEPH_CONF}"
-
-    if [ -n "$CEPH_USER" ]; then
-        IMPORT_SOURCE="${IMPORT_SOURCE}&"
-    elif [ -n "$CEPH_KEY" ]; then
-        IMPORT_SOURCE="${IMPORT_SOURCE}&"
-    else
-        IMPORT_SOURCE="${IMPORT_SOURCE}?"
-    fi
-
-    IMPORT_SOURCE="${IMPORT_SOURCE}CEPH_CONF=${CEPH_CONF}"
+    IMPORT_SOURCE="${IMPORT_SOURCE}${IS_JOIN}CEPH_CONF=${CEPH_CONF}"
 fi
 
 #-------------------------------------------------------------------------------
diff --git a/src/datastore_mad/remotes/downloader.sh b/src/datastore_mad/remotes/downloader.sh
index 96cc7202df..c2b33c164f 100755
--- a/src/datastore_mad/remotes/downloader.sh
+++ b/src/datastore_mad/remotes/downloader.sh
@@ -182,6 +182,7 @@ function get_rbd_cmd
                         SOURCE \
                         PARAM_DS \
                         PARAM_CEPH_USER \
+                        PARAM_CEPH_KEY \
                         PARAM_CEPH_CONF)
 
     USER="${URL_ELEMENTS[j++]}"
@@ -189,6 +190,7 @@ function get_rbd_cmd
     SOURCE="${URL_ELEMENTS[j++]}"
     DS="${URL_ELEMENTS[j++]}"
     CEPH_USER="${URL_ELEMENTS[j++]}"
+    CEPH_KEY="${URL_ELEMENTS[j++]}"
     CEPH_CONF="${URL_ELEMENTS[j++]}"
 
     # Remove leading '/'
@@ -202,6 +204,10 @@ function get_rbd_cmd
         RBD="$RBD --id ${CEPH_USER}"
     fi
 
+    if [ -n "$CEPH_KEY" ]; then
+        RBD="$RBD --keyfile ${CEPH_KEY}"
+    fi
+
     if [ -n "$CEPH_CONF" ]; then
         RBD="$RBD --conf ${CEPH_CONF}"
     fi