forked from Fediversity/Fediversity
Track machines' descriptions
This commit is contained in:
parent
f34f2e45ab
commit
b42d654ab6
7 changed files with 26 additions and 0 deletions
infra
|
@ -41,6 +41,15 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
description = mkOption {
|
||||
description = ''
|
||||
A human-readable description of the machine's purpose. It should be
|
||||
constituted of a first line giving a very short description, followed
|
||||
by a blank line, then followed by more details if necessary.
|
||||
'';
|
||||
default = "";
|
||||
};
|
||||
|
||||
##########################################################################
|
||||
## Virtualised hardware
|
||||
|
||||
|
|
|
@ -115,9 +115,12 @@ let
|
|||
inherit ((makeResourceConfig { inherit vmName isTestVm; }).fediversityVm)
|
||||
proxmox
|
||||
vmId
|
||||
description
|
||||
|
||||
sockets
|
||||
cores
|
||||
memory
|
||||
|
||||
hostPublicKey
|
||||
unsafeHostPrivateKey
|
||||
;
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
fediversityVm = {
|
||||
vmId = 200;
|
||||
proxmox = "fediversity";
|
||||
description = "Testing machine for Hans";
|
||||
|
||||
domain = "abundos.eu";
|
||||
ipv4 = {
|
||||
address = "95.215.187.200";
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
{
|
||||
fediversityVm = {
|
||||
vmId = 201;
|
||||
proxmox = "fediversity";
|
||||
description = "FediPanel";
|
||||
|
||||
domain = "abundos.eu";
|
||||
ipv4 = {
|
||||
address = "95.215.187.201";
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{
|
||||
fediversityVm = {
|
||||
proxmox = "procolix";
|
||||
description = "Forgejo";
|
||||
|
||||
ipv4.address = "185.206.232.34";
|
||||
ipv6.address = "2a00:51c0:12:1201::20";
|
||||
};
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{
|
||||
fediversityVm = {
|
||||
proxmox = "procolix";
|
||||
description = "Wiki";
|
||||
|
||||
ipv4.address = "185.206.232.187";
|
||||
ipv6.address = "2a00:51c0:12:1201::187";
|
||||
};
|
||||
|
|
|
@ -181,6 +181,7 @@ grab_vm_options () {
|
|||
|
||||
proxmox=$(echo "$options" | jq -r .proxmox)
|
||||
vm_id=$(echo "$options" | jq -r .vmId)
|
||||
description=$(echo "$options" | jq -r .description)
|
||||
|
||||
if [ "$proxmox" != fediversity ]; then
|
||||
die "I do not know how to provision things that are not Fediversity VMs,
|
||||
|
@ -286,6 +287,7 @@ create_vm () {
|
|||
vmid=="$vm_id" \
|
||||
name=="$vm_name" \
|
||||
pool==Fediversity \
|
||||
description=="$description" \
|
||||
\
|
||||
ide2=="local:iso/installer-$vm_name.iso,media=cdrom" \
|
||||
ostype==l26 \
|
||||
|
|
Loading…
Add table
Reference in a new issue