diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a725acfa098d238900e5c6f0a96044e277c0a9f..3c7743e1ba21e9235ff5872b57b45f439ca37002 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 e105e504bebc13d89f39e442bfdd99b36cbeef9c..64eb4d8f65fe0a08a5f1cdde1daef2b11c5a336f 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 e57cb04afd2f3d1172c485cfc2df521ae6f16ff8..09cb144188515d541b18a2465b7aa1d5373a604f 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