diff --git a/deployment/check/common/data-model.nix b/deployment/check/common/data-model.nix index 43528cb8..5bcf4237 100644 --- a/deployment/check/common/data-model.nix +++ b/deployment/check/common/data-model.nix @@ -26,8 +26,6 @@ let sshOpts key-file httpBackend - proxmox-user - proxmox-password node-name bridge vlanId @@ -332,8 +330,6 @@ let args deployment-name httpBackend - proxmox-user - proxmox-password node-name bridge vlanId diff --git a/deployment/check/data-model-tf-proxmox/nixosTest.nix b/deployment/check/data-model-tf-proxmox/nixosTest.nix index 7a66d8d2..3261ff65 100644 --- a/deployment/check/data-model-tf-proxmox/nixosTest.nix +++ b/deployment/check/data-model-tf-proxmox/nixosTest.nix @@ -23,8 +23,6 @@ let "ProxyCommand=ssh -W %h:%p pve" ]; key-file = "/root/.ssh/id_ed25519"; - proxmox-user = "root@pam"; - proxmox-password = "mytestpw"; node-name = "pve"; bridge = "br0"; vlanId = 0; diff --git a/deployment/check/data-model-tf/options.nix b/deployment/check/data-model-tf/options.nix index b928087e..3a865236 100644 --- a/deployment/check/data-model-tf/options.nix +++ b/deployment/check/data-model-tf/options.nix @@ -25,15 +25,6 @@ in type = types.str; default = ""; }; - proxmox-user = mkOption { - description = "The ProxmoX user to use."; - type = types.str; - default = "root@pam"; - }; - proxmox-password = mkOption { - description = "The ProxmoX password to use."; - type = types.str; - }; node-name = mkOption { description = "the name of the ProxmoX node to use."; type = types.str; diff --git a/deployment/data-model.nix b/deployment/data-model.nix index 6a1f849c..1b259f80 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -311,16 +311,6 @@ let description = "The path to the root of the repository."; type = types.path; }; - proxmox-user = mkOption { - description = "The ProxmoX user to use."; - type = types.str; - default = "root@pam"; - }; - # TODO: is sensitivity here handled properly? - proxmox-password = mkOption { - description = "The ProxmoX password to use."; - type = types.str; - }; node-name = mkOption { description = "the name of the ProxmoX node to use."; type = types.str; @@ -388,8 +378,6 @@ let deployment-name httpBackend root-path - proxmox-user - proxmox-password node-name bridge vlanId @@ -464,8 +452,6 @@ let bridge ; node_name = node-name; - proxmox_user = proxmox-user; - proxmox_password = proxmox-password; ssh_user = username; vlan_id = vlanId; image_datastore_id = imageDatastoreId; diff --git a/deployment/run/tf-proxmox/main.tf b/deployment/run/tf-proxmox/main.tf index 6d00e7a3..b147f076 100644 --- a/deployment/run/tf-proxmox/main.tf +++ b/deployment/run/tf-proxmox/main.tf @@ -31,15 +31,6 @@ provider "proxmox" { # # port = 22 # } } - - # # Choose one authentication method: - # api_token = var.virtual_environment_api_token - # # OR - username = var.proxmox_user - password = var.proxmox_password - # # OR - # auth_ticket = var.virtual_environment_auth_ticket - # csrf_prevention_token = var.virtual_environment_csrf_prevention_token } # # FIXME move to host diff --git a/deployment/run/tf-proxmox/variables.tf b/deployment/run/tf-proxmox/variables.tf index eb0c90fe..fc4a945f 100644 --- a/deployment/run/tf-proxmox/variables.tf +++ b/deployment/run/tf-proxmox/variables.tf @@ -9,23 +9,6 @@ variable "ssh_user" { default = "root" } -variable "proxmox_user" { - description = <