@celilo/cli 0.5.0-alpha.10 → 0.5.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/cli",
-  "version": "0.5.0-alpha.10",
+  "version": "0.5.0-alpha.11",
   "description": "Celilo — home lab orchestration CLI",
   "type": "module",
   "bin": {

package/src/cli/commands/proxmox-vm-template-build.ts

@@ -33,7 +33,12 @@ import { FuelGauge } from '../fuel-gauge';
 
 const UBUNTU_2404_AMD64_URL =
   'https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img';
-const UBUNTU_2404_AMD64_FILENAME = 'noble-server-cloudimg-amd64.img';
+// Stored under the storage's import/ namespace, so the filename must end in an
+// extension PVE accepts for `import` content (UPLOAD_IMPORT_EXT_RE_1 =
+// ova|qcow2|raw|vmdk) — a `.img` is rejected with "invalid filename or wrong
+// extension". Ubuntu's cloud image is qcow2 format despite the upstream `.img`
+// URL, so we download it under a `.qcow2` name. The URL above is unchanged.
+const UBUNTU_2404_AMD64_FILENAME = 'noble-server-cloudimg-amd64.qcow2';
 const DEFAULT_TEMPLATE_NAME = 'ubuntu-2404-cloudinit';
 
 export interface VmTemplateBuildParams {

package/src/templates/generator.ts

@@ -745,6 +745,10 @@ export async function generateTemplates(options: GenerateOptions): Promise<Gener
         default_target_node: string;
         lxc_template: string;
         storage: string;
+        // Optional: only set once a cloud-init VM template has been built/selected
+        // for the service (see service reconfigure). Required by `type: vm` modules;
+        // absent for services that only deploy LXCs.
+        vm_template?: string;
       };
 
       // ISS-0090: deploy follows REALITY. Resolve the node from Proxmox (it sees
@@ -774,6 +778,13 @@ export async function generateTemplates(options: GenerateOptions): Promise<Gener
       // any stale __infra_target_node a prior generate left behind.
       upsertModuleConfig(db, moduleId, '__infra_lxc_template', providerConfig.lxc_template);
       upsertModuleConfig(db, moduleId, '__infra_storage', providerConfig.storage);
+      // vm_template is only present once a VM template exists for the service.
+      // Persist it when set so `type: vm` modules can resolve $self:vm_template;
+      // a `type: vm` deploy against a service without one then fails loudly at
+      // variable resolution (the intended "no VM template configured" error).
+      if (providerConfig.vm_template) {
+        upsertModuleConfig(db, moduleId, '__infra_vm_template', providerConfig.vm_template);
+      }
       deleteModuleConfig(db, moduleId, '__infra_target_node');
 
       log.success(`Infrastructure resolved: target_node=${decision.node} (${decision.source})`);
@@ -816,7 +827,7 @@ export async function generateTemplates(options: GenerateOptions): Promise<Gener
 
     // lxc_template / storage are provider config (intent, not drift-prone) — read
     // them back from the __infra_* rows persisted above.
-    const infraKeys = ['lxc_template', 'storage'];
+    const infraKeys = ['lxc_template', 'storage', 'vm_template'];
     for (const key of infraKeys) {
       const infraConfig = db
         .select()