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

F #5208: push down ceph_key to downloader to import rbd in marketplace

Browse Source
This commit is contained in:
Ruben S. Montero 2017-07-04 18:42:51 +02:00
parent 0fa579fd46
commit dde9cf317d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/datastore_mad/remotes/ceph/export
View File

@ -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
#-------------------------------------------------------------------------------

6
src/datastore_mad/remotes/downloader.sh
View File

@ -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