From 87ceb8a081b25c51243db3f61a6b6ad8ce3811f0 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Sat, 25 Oct 2025 19:20:35 +0200 Subject: [PATCH] mv comment Signed-off-by: Kiara Grouwstra --- deployment/check/data-model-tf-proxmox/nixosTest.nix | 5 +++-- deployment/run/tf-proxmox-template/main.tf | 3 --- deployment/run/tf-proxmox-vm/main.tf | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/deployment/check/data-model-tf-proxmox/nixosTest.nix b/deployment/check/data-model-tf-proxmox/nixosTest.nix index 66c1d141..2f372e94 100644 --- a/deployment/check/data-model-tf-proxmox/nixosTest.nix +++ b/deployment/check/data-model-tf-proxmox/nixosTest.nix @@ -172,9 +172,10 @@ in cert = pve.succeed("cat /etc/pve/pve-root-ca.pem").strip() - # set up proxmox + pve.succeed("pvesh create /pools --poolid Fediversity") + + # allow upload of `import` (template) files pve.succeed(""" - pvesh create /pools --poolid Fediversity pvesh set /storage/local --content "vztmpl,rootdir,backup,snippets,import,iso,images" 1>/dev/null """) diff --git a/deployment/run/tf-proxmox-template/main.tf b/deployment/run/tf-proxmox-template/main.tf index 9d7a043e..24d18e82 100644 --- a/deployment/run/tf-proxmox-template/main.tf +++ b/deployment/run/tf-proxmox-template/main.tf @@ -42,9 +42,6 @@ resource "proxmox_virtual_environment_file" "upload" { data.external.hash, ] content_type = "import" - # https://192.168.51.81:8006/#v1:0:=storage%2Fnode051%2Flocal:4::=contentIso::::: - # PVE -> Datacenter -> Storage -> local -> Edit -> General -> Content -> check Import + Disk Images -> OK - # that UI action also adds it in `/etc/pve/storage.cfg` datastore_id = var.image_datastore_id node_name = var.node_name overwrite = true diff --git a/deployment/run/tf-proxmox-vm/main.tf b/deployment/run/tf-proxmox-vm/main.tf index 6da70f39..d579b34a 100644 --- a/deployment/run/tf-proxmox-vm/main.tf +++ b/deployment/run/tf-proxmox-vm/main.tf @@ -117,7 +117,7 @@ resource "null_resource" "await_ssh" { proxmox_virtual_environment_vm.nix_vm ] provisioner "local-exec" { - command = "env username='root' host='${proxmox_virtual_environment_vm.nix_vm.ipv4_addresses[1][0]}' key_file=${var.key_file} ssh_opts='${var.ssh_opts}' bash ./await-ssh.sh" + command = "env username='root' host='${proxmox_virtual_environment_vm.nix_vm.ipv4_addresses[1][0]}' key_file='${var.key_file}' ssh_opts='${var.ssh_opts}' bash ./await-ssh.sh" } }