Reuse dev-scripts pools to avoid conflicts

Dev-scripts creates pools with varying names (oooq_pool, eci-XXXX-1).
Our script now finds and reuses whatever pool points to our cluster
path instead of trying to create a new one, avoiding conflicts.

Also fixes cleanup to remove pools by path, not just by name.

Author: eliorerz

scripts/cleanup.sh

@@ -253,11 +253,44 @@ if [ -n "${WORKING_DIR:-}" ]; then
 fi
 
 # Clean up cluster-specific libvirt storage pools
-# - ${CLUSTER_NAME}: dev-scripts pool (shared by masters and Landing Zone with flat structure)
-# - ${CLUSTER_NAME}-lz: Legacy separate Landing Zone pool (backwards compatibility)
-# - ${CLUSTER_NAME}_pool: Legacy separate Landing Zone pool (backwards compatibility)
-# Note: New deployments only create ${CLUSTER_NAME} pool, but we check all for cleanup
+# Find all pools that point to our cluster directory, regardless of name
+# Dev-scripts may create pools with various names (oooq_pool, ${CLUSTER_NAME}, etc.)
+CLUSTER_POOL_PATH=""
+if [ -n "${WORKING_DIR:-}" ]; then
+    if [[ "${WORKING_DIR}" == *"/clusters/${CLUSTER_NAME}" ]]; then
+        CLUSTER_POOL_PATH="${WORKING_DIR}/pool"
+    elif [ -n "${BASE_WORKING_DIR:-}" ]; then
+        CLUSTER_POOL_PATH="${BASE_WORKING_DIR}/clusters/${CLUSTER_NAME}/pool"
+    fi
+fi
+
+# Build list of pools to clean up
+POOLS_TO_CLEAN=()
+
+# Add standard pool names we might have created
 for POOL_NAME in "${CLUSTER_NAME}" "${CLUSTER_NAME}-lz" "${CLUSTER_NAME}_pool"; do
+    if sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
+        POOLS_TO_CLEAN+=("$POOL_NAME")
+    fi
+done
+
+# Also find any pool pointing to our cluster-specific path (handles oooq_pool, etc.)
+if [ -n "$CLUSTER_POOL_PATH" ]; then
+    while IFS= read -r pool; do
+        if [ -n "$pool" ]; then
+            POOL_PATH_CHECK=$(sudo virsh pool-dumpxml "$pool" 2>/dev/null | grep -oP '(?<=<path>).*(?=</path>)' || echo "")
+            if [ "$POOL_PATH_CHECK" = "$CLUSTER_POOL_PATH" ]; then
+                # Check if not already in the list
+                if [[ ! " ${POOLS_TO_CLEAN[@]} " =~ " ${pool} " ]]; then
+                    info "Found pool '$pool' pointing to cluster path, will clean it up"
+                    POOLS_TO_CLEAN+=("$pool")
+                fi
+            fi
+        fi
+    done < <(sudo virsh pool-list --all --name)
+fi
+
+for POOL_NAME in "${POOLS_TO_CLEAN[@]}"; do
     if sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
         info "Removing libvirt storage pool: $POOL_NAME"
 
@@ -378,14 +411,31 @@ if [ -n "${WORKING_DIR:-}" ]; then
     fi
 fi
 
-# Check for leftover pool definitions (dev-scripts pool and legacy Landing Zone pools)
+# Check for leftover pool definitions (by name or by path)
 LEFTOVER_POOLS=""
+
+# Check standard pool names
 for POOL_NAME in "${CLUSTER_NAME}" "${CLUSTER_NAME}-lz" "${CLUSTER_NAME}_pool"; do
     if sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
         LEFTOVER_POOLS="${LEFTOVER_POOLS}${POOL_NAME} "
     fi
 done
 
+# Check for any pool pointing to cluster path (handles oooq_pool, etc.)
+if [ -n "$CLUSTER_POOL_PATH" ]; then
+    while IFS= read -r pool; do
+        if [ -n "$pool" ]; then
+            POOL_PATH_CHECK=$(sudo virsh pool-dumpxml "$pool" 2>/dev/null | grep -oP '(?<=<path>).*(?=</path>)' || echo "")
+            if [ "$POOL_PATH_CHECK" = "$CLUSTER_POOL_PATH" ]; then
+                # Add if not already in list
+                if [[ ! "$LEFTOVER_POOLS" =~ $pool ]]; then
+                    LEFTOVER_POOLS="${LEFTOVER_POOLS}${pool} "
+                fi
+            fi
+        fi
+    done < <(sudo virsh pool-list --all --name)
+fi
+
 if [ -n "$LEFTOVER_POOLS" ]; then
     warning "Found leftover pool definition(s): $LEFTOVER_POOLS"
 else

scripts/provision_landing_zone.sh

@@ -170,12 +170,13 @@ if sudo virsh list --all | grep -q "$LZ_VM_NAME"; then
     info "✓ Existing VM removed"
 fi
 
-# Create cluster-specific storage pool if it doesn't exist
-# dev-scripts creates the pool directory but doesn't always register it with libvirt
+# Find or create storage pool for cluster-specific path
+# dev-scripts may create a pool (possibly named oooq_pool) pointing to our cluster path
+# We'll use whatever pool exists for our path, or create one if needed
 if ! sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
-    info "Cluster-specific pool '$POOL_NAME' not found, creating it..."
+    info "Pool '$POOL_NAME' not found, checking if any pool uses path $POOL_PATH..."
 
-    # Check if any pool already uses this path (would cause conflict)
+    # Check if any pool already points to our cluster-specific path
     EXISTING_POOL=$(sudo virsh pool-list --all --name | while read pool; do
         if [ -n "$pool" ]; then
             POOL_PATH_CHECK=$(sudo virsh pool-dumpxml "$pool" 2>/dev/null | grep -oP '(?<=<path>).*(?=</path>)' || echo "")
@@ -187,22 +188,18 @@ if ! sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
     done)
 
     if [ -n "$EXISTING_POOL" ]; then
-        error "Storage pool path conflict detected!"
-        error "  Path: $POOL_PATH"
-        error "  Already used by pool: $EXISTING_POOL"
-        error "  Trying to create pool: $POOL_NAME"
-        error ""
-        error "This usually means another cluster is using the same directory."
-        error "Check running clusters: sudo virsh pool-list --all"
-        error "Or cleanup orphaned pools: make clean-orphaned"
-        exit 1
-    fi
+        # A pool exists for our path - use it regardless of name
+        info "Found existing pool '$EXISTING_POOL' using path $POOL_PATH, will use it"
+        POOL_NAME="$EXISTING_POOL"
+    else
+        # No pool exists for our path - create one
+        info "No pool found for path $POOL_PATH, creating pool '$POOL_NAME'..."
 
-    # Create the pool directory if it doesn't exist
-    sudo mkdir -p "$POOL_PATH"
+        # Create the pool directory if it doesn't exist
+        sudo mkdir -p "$POOL_PATH"
 
-    # Define and start the pool
-    sudo virsh pool-define /dev/stdin <<EOF
+        # Define and start the pool
+        sudo virsh pool-define /dev/stdin <<EOF
 <pool type='dir'>
   <name>$POOL_NAME</name>
   <target>
@@ -216,9 +213,10 @@ if ! sudo virsh pool-uuid "$POOL_NAME" > /dev/null 2>&1; then
 </pool>
 EOF
 
-    sudo virsh pool-start "$POOL_NAME"
-    sudo virsh pool-autostart "$POOL_NAME"
-    info "✓ Storage pool '$POOL_NAME' created and started"
+        sudo virsh pool-start "$POOL_NAME"
+        sudo virsh pool-autostart "$POOL_NAME"
+        info "✓ Storage pool '$POOL_NAME' created and started"
+    fi
 else
     info "Using existing storage pool: $POOL_NAME"
 fi