diff --git a/deployment/check/data-model-tf-proxmox/nixosTest.nix b/deployment/check/data-model-tf-proxmox/nixosTest.nix index 2f372e94..41de4e1d 100644 --- a/deployment/check/data-model-tf-proxmox/nixosTest.nix +++ b/deployment/check/data-model-tf-proxmox/nixosTest.nix @@ -15,7 +15,6 @@ let TF_HTTP_UNLOCK_ADDRESS = TF_HTTP_ADDRESS; TF_HTTP_ADDRESS = "http://localhost:${backendPort}/state/${fragment}"; }; - # FIXME generate the image `nixos-generate` was to make, but now do it for a desired `-c configuration.nix` rather than whatever generic thing now template-deployment = (import ./setups/template.nix { inherit sources system modulesPath; diff --git a/deployment/run/tf-proxmox-template/main.tf b/deployment/run/tf-proxmox-template/main.tf index 24d18e82..5fb77695 100644 --- a/deployment/run/tf-proxmox-template/main.tf +++ b/deployment/run/tf-proxmox-template/main.tf @@ -30,13 +30,6 @@ data "external" "hash" { program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ../../..)\\\"}\""] } -# FIXME (un)stream -# FIXME handle known-hosts in TF state -# FIXME move to host -# FIXME switch to base image shared between jobs as upload seems a bottleneck? e.g. by: -# - recursive TF -# - hash in name over overwrite -# won't notice file changes: https://github.com/bpg/terraform-provider-proxmox/issues/677 resource "proxmox_virtual_environment_file" "upload" { depends_on = [ data.external.hash, diff --git a/deployment/run/tf-proxmox-vm/main.tf b/deployment/run/tf-proxmox-vm/main.tf index d579b34a..dbfc5f10 100644 --- a/deployment/run/tf-proxmox-vm/main.tf +++ b/deployment/run/tf-proxmox-vm/main.tf @@ -14,15 +14,10 @@ provider "proxmox" { endpoint = "https://${var.host}:8006/" # used only for files and creating custom disks + # FIXME handle known-hosts in TF state ssh { agent = true - # uncomment and configure if using api_token instead of password username = "root" - # node { - # name = "${var.node_name}" - # address = "${var.host}" - # # port = 22 - # } } } @@ -34,8 +29,6 @@ data "external" "hash" { resource "proxmox_virtual_environment_vm" "nix_vm" { lifecycle { - # wait, would this not disseminate any changes to this property, - # or just defer syncing when only this changed? ignore_changes = [ disk["import_from"], initialization,