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

OpenNebula · May 20, 2019 · f07da23 · f07da23
1 parent bfa43cc
commit f07da23
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/tm_mad/ceph/monitor b/src/tm_mad/ceph/monitor
@@ -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