kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

pass proxmox user/pw thru env var as well, should fix usage from flake again

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-10-19 20:02:04 +02:00
parent a2a57471c7
commit c308b264ad
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
7 changed files with 30 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deployment/check/common/data-model.nix
View file

@ -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

2
deployment/check/data-model-tf-proxmox/nixosTest.nix
View file

@ -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;

9
deployment/check/data-model-tf/options.nix
View file

@ -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;

14
deployment/data-model.nix
View file

@ -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;

9
deployment/run/tf-proxmox/main.tf
View file

@ -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

17
deployment/run/tf-proxmox/variables.tf
View file

@ -9,23 +9,6 @@ variable "ssh_user" {
default = "root"
}
variable "proxmox_user" {
description = <<EOT
the ProxmoX user to use. needs privileges:
- `VM.Monitor`
- ...
EOT
type = string
default = "root@pam"
}
variable "proxmox_password" {
description = "the ProxmoX password to use"
type = string
sensitive = true
default = ""
}
variable "host" {
description = "the host of the ProxmoX Virtual Environment."
type = string

58
flake.nix
View file

@ -81,35 +81,37 @@
apps.default =
let
inherit (pkgs) system;
deployment =
(import ./deployment/check/common/data-model.nix {
inherit system;
config = {
targetSystem = system;
nodeName = "192.168.51.81"; # root@fediversity-proxmox
pathToRoot = builtins.path {
path = ./.;
name = "root";
deployment = pkgs.writeShellScriptBin "my-app-with-environment" ''
export PROXMOX_VE_SSH_USERNAME="kiara@ProcoliX"
export PROXMOX_VE_SSH_PASSWORD=""
${(import ./deployment/check/common/data-model.nix {
inherit system;
config = {
targetSystem = system;
nodeName = "192.168.51.81"; # root@fediversity-proxmox
pathToRoot = builtins.path {
path = ./.;
name = "root";
};
sshOpts = [ ];
key-file = "";
node-name = "node051";
bridge = "ovsbr0";
vlanId = 1305;
imageDatastoreId = "local";
vmDatastoreId = "linstor_storage";
cdDatastoreId = "local-lvm";
ipv4Gateway = "eth0";
ipv4Address = "";
# ipv4Address = "95.215.187.${vm-id}";
ipv6Gateway = "eth0";
ipv6Address = "";
# ipv6Address = "2a00:51c0:13:1305::${vm-id}";
};
sshOpts = [ ];
key-file = "";
proxmox-user = "kiara@ProcoliX";
proxmox-password = "";
node-name = "node051";
bridge = "ovsbr0";
vlanId = 1305;
imageDatastoreId = "local";
vmDatastoreId = "linstor_storage";
cdDatastoreId = "local-lvm";
ipv4Gateway = "eth0";
ipv4Address = "";
# ipv4Address = "95.215.187.${vm-id}";
ipv6Gateway = "eth0";
ipv6Address = "";
# ipv6Address = "2a00:51c0:13:1305::${vm-id}";
};
# opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call
})."tf-proxmox-deployment".tf-proxmox-host;
# opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call
})."tf-proxmox-deployment".tf-proxmox-host
}
'';
in
{
type = "app";