feat: implement defaultStorage per #198

runleveldev · runleveldev · commit 7dd0cd525ccd · 2026-02-16T13:45:18.000-05:00
diff --git a/create-a-container/bin/create-container.js b/create-a-container/bin/create-container.js
@@ -48,6 +48,30 @@ function generateImageFilename(parsed, digest) {
   return sanitized;
 }
 
+/**
+ * Resolve which Proxmox storage to use for a given content type.
+ * Returns the preferred storage if it supports the content type,
+ * otherwise falls back to the largest enabled storage that does.
+ * @param {object} client - ProxmoxApi instance
+ * @param {string} nodeName - Proxmox node name
+ * @param {string} preferred - Preferred storage name
+ * @param {string} contentType - Proxmox content type ('vztmpl' or 'rootdir')
+ * @returns {Promise<string>} Resolved storage name
+ * @throws {Error} If no enabled storage supports the content type
+ */
+async function resolveStorage(client, nodeName, preferred, contentType) {
+  const storages = await client.datastores(nodeName, contentType, true);
+  if (storages.length === 0) {
+    throw new Error(`No enabled storage on node ${nodeName} supports content type '${contentType}'`);
+  }
+  if (storages.some(s => s.storage === preferred)) {
+    return preferred;
+  }
+  const largest = storages.reduce((max, s) => (s.total > max.total ? s : max), storages[0]);
+  console.warn(`Storage '${preferred}' does not support '${contentType}' on node ${nodeName}, falling back to '${largest.storage}'`);
+  return largest.storage;
+}
+
 /**
  * Setup ACL for container owner
  * Grants PVEVMUser role to username@ldap on /vms/{vmid}
@@ -180,8 +204,9 @@ async function main() {
       const parsed = parseDockerRef(container.template);
       console.log(`Docker image: ${parsed.registry}/${parsed.namespace}/${parsed.image}:${parsed.tag}`);
       
-      const storage = node.imageStorage || 'local';
-      console.log(`Using storage: ${storage}`);
+      const templateStorage = await resolveStorage(client, node.name, node.imageStorage || 'local', 'vztmpl');
+      const rootfsStorage = await resolveStorage(client, node.name, node.volumeStorage || 'local-lvm', 'rootdir');
+      console.log(`Using template storage: ${templateStorage}, rootfs storage: ${rootfsStorage}`);
       
       // Get image digest from registry to create unique filename
       const repo = parsed.namespace ? `${parsed.namespace}/${parsed.image}` : parsed.image;
@@ -193,8 +218,8 @@ async function main() {
       console.log(`Target filename: ${filename}`);
       
       // Check if image already exists in storage
-      const existingContents = await client.storageContents(node.name, storage, 'vztmpl');
-      const expectedVolid = `${storage}:vztmpl/${filename}.tar`;
+      const existingContents = await client.storageContents(node.name, templateStorage, 'vztmpl');
+      const expectedVolid = `${templateStorage}:vztmpl/${filename}.tar`;
       const imageExists = existingContents.some(item => item.volid === expectedVolid);
       
       if (imageExists) {
@@ -203,7 +228,7 @@ async function main() {
         // Pull the image from OCI registry
         const imageRef = container.template;
         console.log(`Pulling image ${imageRef}...`);
-        const pullUpid = await client.pullOciImage(node.name, storage, {
+        const pullUpid = await client.pullOciImage(node.name, templateStorage, {
           reference: imageRef,
           filename
         });
@@ -216,7 +241,7 @@ async function main() {
       
       // Create container from the pulled image (Proxmox adds .tar to the filename)
       console.log(`Creating container from ${filename}.tar...`);
-      const ostemplate = `${storage}:vztmpl/${filename}.tar`;
+      const ostemplate = `${templateStorage}:vztmpl/${filename}.tar`;
       const createUpid = await client.createLxc(node.name, {
         vmid,
         hostname: container.hostname,
@@ -231,7 +256,7 @@ async function main() {
         onboot: 1,
         tags: container.username,
         unprivileged: 1,
-        storage: 'local-lvm'
+        storage: rootfsStorage
       });
       console.log(`Create task started: ${createUpid}`);
       
@@ -252,12 +277,16 @@ async function main() {
       const templateVmid = templateContainer.vmid;
       console.log(`Found template VMID: ${templateVmid}`);
       
+      const rootfsStorage = await resolveStorage(client, node.name, node.volumeStorage || 'local-lvm', 'rootdir');
+      console.log(`Using rootfs storage: ${rootfsStorage}`);
+      
       // Clone the template
       console.log(`Cloning template ${templateVmid} to VMID ${vmid}...`);
       const cloneUpid = await client.cloneLxc(node.name, templateVmid, vmid, {
         hostname: container.hostname,
         description: `Cloned from template ${container.template}`,
-        full: 1
+        full: 1,
+        storage: rootfsStorage
       });
       console.log(`Clone task started: ${cloneUpid}`);
       
diff --git a/create-a-container/migrations/20260216183500-add-node-volume-storage.js b/create-a-container/migrations/20260216183500-add-node-volume-storage.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.addColumn('Nodes', 'volumeStorage', {
+      type: Sequelize.STRING(255),
+      allowNull: false,
+      defaultValue: 'local-lvm'
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeColumn('Nodes', 'volumeStorage');
+  }
+};
diff --git a/create-a-container/models/node.js b/create-a-container/models/node.js
@@ -86,6 +86,11 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.STRING(255),
       allowNull: false,
       defaultValue: 'local'
+    },
+    volumeStorage: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+      defaultValue: 'local-lvm'
     }
   }, {
     sequelize,
diff --git a/create-a-container/routers/nodes.js b/create-a-container/routers/nodes.js
@@ -117,7 +117,7 @@ router.post('/', async (req, res) => {
       return res.redirect('/sites');
     }
 
-    const { name, ipv4Address, apiUrl, tokenId, secret, tlsVerify, imageStorage } = req.body;
+    const { name, ipv4Address, apiUrl, tokenId, secret, tlsVerify, imageStorage, volumeStorage } = req.body;
     
     await Node.create({
       name,
@@ -127,6 +127,7 @@ router.post('/', async (req, res) => {
       secret: secret || null,
       tlsVerify: tlsVerify === '' || tlsVerify === null ? null : tlsVerify === 'true',
       imageStorage: imageStorage || 'local',
+      volumeStorage: volumeStorage || 'local-lvm',
       siteId
     });
 
@@ -170,6 +171,7 @@ router.post('/import', async (req, res) => {
     const nodesWithIp = await Promise.all(nodes.map(async (n) => {
       let ipv4Address = null;
       let imageStorage = 'local';
+      let volumeStorage = 'local-lvm';
 
       try {
         const networkInterfaces = await client.nodeNetwork(n.node);
@@ -193,6 +195,17 @@ router.post('/import', async (req, res) => {
         console.error(`Failed to fetch storages for node ${n.node}:`, err.message);
       }
 
+      // Find largest storage supporting CT volumes (rootdir)
+      try {
+        const storages = await client.datastores(n.node, 'rootdir', true);
+        if (storages.length > 0) {
+          const largest = storages.reduce((max, s) => (s.total > max.total ? s : max), storages[0]);
+          volumeStorage = largest.storage;
+        }
+      } catch (err) {
+        console.error(`Failed to fetch volume storages for node ${n.node}:`, err.message);
+      }
+
       return {
         name: n.node,
         ipv4Address,
@@ -201,6 +214,7 @@ router.post('/import', async (req, res) => {
         secret,
         tlsVerify: tlsVerify === '' || tlsVerify === null ? null : tlsVerify === 'true',
         imageStorage,
+        volumeStorage,
         siteId
       };
     }));
@@ -249,15 +263,16 @@ router.put('/:id', async (req, res) => {
       return res.redirect(`/sites/${siteId}/nodes`);
     }
 
-    const { name, ipv4Address, apiUrl, tokenId, secret, tlsVerify, imageStorage } = req.body;
+    const { name, ipv4Address, apiUrl, tokenId, secret, tlsVerify, imageStorage, volumeStorage } = req.body;
     
     const updateData = {
       name,
       ipv4Address: ipv4Address || null,
       apiUrl: apiUrl || null,
       tokenId: tokenId || null,
       tlsVerify: tlsVerify === '' || tlsVerify === null ? null : tlsVerify === 'true',
-      imageStorage: imageStorage || 'local'
+      imageStorage: imageStorage || 'local',
+      volumeStorage: volumeStorage || 'local-lvm'
     };
 
     // Only update secret if a new value was provided
diff --git a/create-a-container/views/nodes/form.ejs b/create-a-container/views/nodes/form.ejs
@@ -114,6 +114,22 @@
         <div class="form-text">Storage for CT Template images used when building containers</div>
       </div>
 
+      <div class="mb-3">
+        <label for="volumeStorage" class="form-label">Volume Storage</label>
+        <input 
+          type="text" 
+          class="form-control" 
+          id="volumeStorage" 
+          name="volumeStorage" 
+          value="<%= node && node.volumeStorage ? node.volumeStorage : 'local-lvm' %>"
+          placeholder="e.g., local-lvm"
+          list="volumeStorageList"
+          autocomplete="off"
+        >
+        <datalist id="volumeStorageList"></datalist>
+        <div class="form-text">Storage for container root filesystems</div>
+      </div>
+
       <div class="d-flex justify-content-between">
         <a href="/sites/<%= site.id %>/nodes" class="btn btn-secondary" aria-label="Cancel and return to nodes list">Cancel</a>
         <button type="submit" class="btn btn-primary">
@@ -135,11 +151,13 @@
   fetch('/sites/<%= site.id %>/nodes/<%= node.id %>/storages')
     .then(res => res.json())
     .then(storages => {
-      const datalist = document.getElementById('imageStorageList');
+      const imageDatalist = document.getElementById('imageStorageList');
+      const volumeDatalist = document.getElementById('volumeStorageList');
       storages.forEach(s => {
         const option = document.createElement('option');
         option.value = s.name;
-        datalist.appendChild(option);
+        imageDatalist.appendChild(option);
+        volumeDatalist.appendChild(option.cloneNode(true));
       });
     })
     .catch(() => {});
diff --git a/mie-opensource-landing/docs/admins/core-concepts/nodes.md b/mie-opensource-landing/docs/admins/core-concepts/nodes.md
@@ -13,6 +13,8 @@ Nodes are Proxmox VE servers within a site that host containers.
 - **API URL**: e.g., `https://192.168.1.10:8006/api2/json`
 - **Authentication**: Username/password or API token
 - **TLS Verification**: Enable/disable certificate validation
+- **Template Storage**: Proxmox storage for CT template images (`vztmpl` content)
+- **Volume Storage**: Proxmox storage for container root filesystems (`rootdir` content)
 
 ## Adding Nodes
 
@@ -57,3 +59,16 @@ Proxmox uses self-signed certificates by default. Either disable TLS verificatio
 - **Delete**: Remove a node (must have no active containers first)
 - **Multi-node**: Proxmox supports HA features — see [Proxmox HA docs](https://pve.proxmox.com/wiki/High_Availability)
 
+## Storage Configuration
+
+Nodes have two storage settings because most Proxmox storage types only support one content type.
+
+| Setting | Content Type | Default | Purpose |
+|---|---|---|---|
+| **Template Storage** | `vztmpl` | `local` | Stores pulled Docker/OCI images as CT templates |
+| **Volume Storage** | `rootdir` | `local-lvm` | Stores container root filesystems |
+
+If a configured storage does not support the required content type, the system falls back to the largest enabled storage on the node that does. If no storage supports the required content type, container creation fails.
+
+To verify storage content types in Proxmox, navigate to **Datacenter → Storage** and check the **Content** column.
+
diff --git a/mie-opensource-landing/docs/developers/database-schema.md b/mie-opensource-landing/docs/developers/database-schema.md
@@ -45,6 +45,7 @@ erDiagram
         string apiTokenSecretOrPassword
         boolean disableTlsVerification
         string imageStorage "default: local"
+        string volumeStorage "default: local-lvm"
         int siteId FK
     }
 
@@ -170,7 +171,7 @@ erDiagram
 Top-level organizational unit. Has many Nodes and ExternalDomains.
 
 ### Node
-Proxmox VE server within a site. `name` must match Proxmox hostname (unique). `imageStorage` defaults to `'local'`. Belongs to Site, has many Containers.
+Proxmox VE server within a site. `name` must match Proxmox hostname (unique). `imageStorage` defaults to `'local'` (CT templates). `volumeStorage` defaults to `'local-lvm'` (container rootfs). Belongs to Site, has many Containers.
 
 ### Container
 LXC container on a Proxmox node. Unique composite index on `(nodeId, containerId)`. `hostname`, `macAddress`, `ipv4Address` globally unique. Belongs to Node and optionally to a Job.
