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

F #3222: return ec pool usage if used (#3333)

Browse Source 
(cherry picked from commit f07da23bcec75f3fa35f8883c85c07397ffd68ac)
This commit is contained in:
Daniel Clavijo Coca 2019-05-20 04:35:50 -05:00 committed by Ruben S. Montero
parent e178b5caba
commit 6272fb2143
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tm_mad/ceph/monitor
View File

@ -48,12 +48,14 @@ 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/EC_POOL_NAME \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_KEY \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_CONF)
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
EC_POOL_NAME="${XPATH_ELEMENTS[j++]}"
CEPH_USER="${XPATH_ELEMENTS[j++]}"
CEPH_KEY="${XPATH_ELEMENTS[j++]}"
CEPH_CONF="${XPATH_ELEMENTS[j++]}"
@ -78,6 +80,8 @@ if [ -n "$CEPH_CONF" ]; then
RADOS="$RADOS --conf ${CEPH_CONF}"
fi
[ -n "$EC_POOL_NAME" ] && POOL_NAME="$EC_POOL_NAME"
# ------------ Compute datastore usage -------------
MONITOR_SCRIPT=$(cat <<EOF