mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 12:22:38 +09:00
Modified 2 lines and rados command to take into account the POOL_NAME and CEPH_USER from the datastore template.
At this moment all Ceph remotes are using Ceph admin privileges. This could be a sec. issue, CEPH_USER should be a mandatory param into Ceph datastores and it should be used by Ceph remotes by default.
This commit is contained in:
1 parent
0256ab039b
commit
0921cfd343
5 files changed
+50
-13
No files matched your search
@@ -48,7 +48,8 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/PATH \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
|
||||
|
||||
unset i
|
||||
|
||||
@@ -57,6 +58,7 @@ BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||
POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}"
|
||||
SRC="${XPATH_ELEMENTS[i++]}"
|
||||
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||
CEPH_USER="${XPATH_ELEMENTS[i++]}"
|
||||
|
||||
DST_HOST=`get_destination_host $ID`
|
||||
|
||||
@@ -65,12 +67,17 @@ if [ -z "$DST_HOST" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ -z "$CEPH_USER" ]; then
|
||||
error_message "Datastore template missing 'CEPH_USER' attribute."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
SAFE_DIRS=""
|
||||
|
||||
IMAGE_NAME="one-${ID}"
|
||||
RBD_DST="${POOL_NAME}/${IMAGE_NAME}"
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST" \
|
||||
ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST --id ${CEPH_USER}" \
|
||||
"Error cloning $SRC to $RBD_DST in $DST_HOST"
|
||||
|
||||
echo "$RBD_DST"
|
||||
@@ -60,7 +60,8 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
|
||||
|
||||
unset i
|
||||
|
||||
@@ -77,6 +78,7 @@ MD5="${XPATH_ELEMENTS[i++]}"
|
||||
SHA1="${XPATH_ELEMENTS[i++]}"
|
||||
NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
|
||||
LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
|
||||
CEPH_USER="${XPATH_ELEMENTS[i++]}"
|
||||
|
||||
DST_HOST=`get_destination_host $ID`
|
||||
|
||||
@@ -85,6 +87,12 @@ if [ -z "$DST_HOST" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ -z "$CEPH_USER" ]; then
|
||||
error_message "Datastore template missing 'CEPH_USER' attribute."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
|
||||
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
|
||||
|
||||
IMAGE_HASH=`generate_image_hash`
|
||||
@@ -134,7 +142,7 @@ REGISTER_CMD=$(cat <<EOF
|
||||
mv $TMP_DST.raw $TMP_DST
|
||||
fi
|
||||
|
||||
$RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
|
||||
$RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
|
||||
|
||||
# remove original
|
||||
$RM -f $TMP_DST
|
||||
@@ -142,6 +150,6 @@ EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" \
|
||||
"Error registering $RBD_SOURCE in $DST_HOST"
|
||||
"Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
|
||||
|
||||
echo "$RBD_SOURCE"
|
||||
@@ -54,7 +54,8 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RBD_FORMAT \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
|
||||
|
||||
unset i
|
||||
|
||||
@@ -67,6 +68,7 @@ STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
|
||||
RBD_FORMAT="${XPATH_ELEMENTS[i++]:-$RBD_FORMAT}"
|
||||
FSTYPE="${XPATH_ELEMENTS[i++]}"
|
||||
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||
CEPH_USER="${XPATH_ELEMENTS[i++]}"
|
||||
|
||||
DST_HOST=`get_destination_host $ID`
|
||||
|
||||
@@ -75,6 +77,11 @@ if [ -z "$DST_HOST" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ -z "$CEPH_USER" ]; then
|
||||
error_message "Datastore template missing 'CEPH_USER' attribute."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
|
||||
|
||||
IMAGE_HASH=`generate_image_hash`
|
||||
@@ -103,14 +110,14 @@ REGISTER_CMD=$(cat <<EOF
|
||||
export PATH=/usr/sbin:/sbin:\$PATH
|
||||
|
||||
if [ "$FSTYPE" = "raw" ]; then
|
||||
$RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE}
|
||||
$RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE} --id ${CEPH_USER}
|
||||
else
|
||||
# create and format
|
||||
$DD if=/dev/zero of=$TMP_DST bs=1 count=1 seek=${SIZE}M
|
||||
$MKFS_CMD
|
||||
|
||||
# create rbd
|
||||
$RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
|
||||
$RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
|
||||
|
||||
# remove original
|
||||
$RM -f $TMP_DST
|
||||
@@ -119,6 +126,6 @@ EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" \
|
||||
"Error registering $RBD_SOURCE in $DST_HOST"
|
||||
"Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
|
||||
|
||||
echo "$RBD_SOURCE"
|
||||
@@ -46,10 +46,12 @@ unset i j XPATH_ELEMENTS
|
||||
while IFS= read -r -d '' element; do
|
||||
XPATH_ELEMENTS[i++]="$element"
|
||||
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
|
||||
|
||||
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
|
||||
POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
|
||||
CEPH_USER="${XPATH_ELEMENTS[j++]}"
|
||||
|
||||
HOST=`get_destination_host`
|
||||
|
||||
@@ -58,10 +60,15 @@ if [ -z "$HOST" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ -z "$CEPH_USER" ]; then
|
||||
error_message "Datastore template missing 'CEPH_USER' attribute."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# ------------ Compute datastore usage -------------
|
||||
|
||||
MONITOR_SCRIPT=$(cat <<EOF
|
||||
$RADOS df | $AWK '{
|
||||
$RADOS df -p ${POOL_NAME} --id ${CEPH_USER}| $AWK '{
|
||||
if (\$1 == "total") {
|
||||
|
||||
space = int(\$3/1024)
|
||||
|
||||
@@ -45,10 +45,12 @@ unset i j XPATH_ELEMENTS
|
||||
while IFS= read -r -d '' element; do
|
||||
XPATH_ELEMENTS[i++]="$element"
|
||||
done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST)
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
|
||||
|
||||
SRC="${XPATH_ELEMENTS[j++]}"
|
||||
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
|
||||
CEPH_USER="${XPATH_ELEMENTS[j++]}"
|
||||
|
||||
DST_HOST=`get_destination_host $ID`
|
||||
|
||||
@@ -57,10 +59,16 @@ if [ -z "$DST_HOST" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ -z "$CEPH_USER" ]; then
|
||||
error_message "Datastore template missing 'CEPH_USER' attribute."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
|
||||
# -------- Remove Image from Datastore ------------
|
||||
|
||||
log "Removing $SRC from the rbd image repository in $DST_HOST"
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC" "Error removing $SRC in $DST_HOST"
|
||||
ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC --id ${CEPH_USER}" "Error removing $SRC in $DST_HOST"
|
||||
|
||||
exit 0
|
||||
Reference in new issue
Block a user