From f1ce169dc59e60456f4e030864a614d45bf30b0a Mon Sep 17 00:00:00 2001
From: James Arcus <jimbo@ucc.asn.au>
Date: Tue, 17 Dec 2024 01:02:30 +0800
Subject: [PATCH] Cleanup from POC work
---
.gitlab-ci.yml | 1 -
main.tf | 4 ++--
membervm_nogui.yaml | 16 ++++------------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a725ac..3c7743e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ apply:
apply
rules:
- if: '$CI_COMMIT_BRANCH == "main"'
- when: manual
before_script:
- tofu init
script:
diff --git a/main.tf b/main.tf
index e105e50..64eb4d8 100644
--- a/main.tf
+++ b/main.tf
@@ -20,11 +20,9 @@ resource "proxmox_vm_qemu" "membervm_nogui" {
for_each = local.config
# Per-VM settings
-
name = each.key
desc = each.value.desc
- vm_state = "stopped"
target_node = each.value.node
sockets = each.value.sockets
@@ -34,6 +32,8 @@ resource "proxmox_vm_qemu" "membervm_nogui" {
ciuser = each.value.primary_user
sshkeys = each.value.primary_sshkey
+ vm_state = each.value.state
+
# Set the template, then all remaining settings must match those for that template
clone = "memberVM-nogui-template"
diff --git a/membervm_nogui.yaml b/membervm_nogui.yaml
index e57cb04..09cb144 100644
--- a/membervm_nogui.yaml
+++ b/membervm_nogui.yaml
@@ -1,19 +1,11 @@
-"test-otf-1":
- desc: "Test VM 1"
+# Copy this block and alter as needed, ensuring the top-level key is not indented.
+"test-otf":
+ desc: "Test VM"
node: medico
sockets: 1
cores: 2
memory: 4096 # in MB
disk: 50G # must be >= 50G
- primary_user: debian
- primary_sshkey: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICSY5zCVa6hsWgGM08u4WVl1bPRjmxLzDyk51ioAd0nT jimbo@potoroo"
-
-"test-otf-2":
- desc: "Test VM 2"
- node: magikarp
- sockets: 1
- cores: 1
- memory: 1024
- disk: 70G # must be >= 50G
primary_user: auser
primary_sshkey: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICSY5zCVa6hsWgGM08u4WVl1bPRjmxLzDyk51ioAd0nT jimbo@potoroo"
+ state: stopped # can be either running or stopped
--
GitLab