From f063baa349ec6a52dbdf11d6ce1324ceab22223a Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Fri, 18 Apr 2025 12:12:28 +0100 Subject: [PATCH 1/2] Worflow: changes vars --- terraform/files/cloud_init_global.yaml | 9 +++- terraform/main.tf | 61 +++++++++++++++----------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/terraform/files/cloud_init_global.yaml b/terraform/files/cloud_init_global.yaml index 8b1dee9..1236010 100644 --- a/terraform/files/cloud_init_global.yaml +++ b/terraform/files/cloud_init_global.yaml @@ -1,4 +1,11 @@ #cloud-config +#cloud-config +hostname: myvm +manage_etc_hosts: true +resolv_conf: + nameservers: + - 8.8.8.8 + - 1.1.1.1 package_update: true package_upgrade: true @@ -13,7 +20,6 @@ packages: - jq - curl - qemu-guest-agent - - salt-minion users: - name: stuart @@ -24,7 +30,6 @@ users: - ${SSH_KEY_PUBLIC} preserve_hostname: false -manage_etc_hosts: false fqdn: ${hostname}.${domain} #cloud-config diff --git a/terraform/main.tf b/terraform/main.tf index 9e6e2ee..fd9af06 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -28,27 +28,31 @@ resource "proxmox_vm_qemu" "alpacas" { cores = var.cores memory = var.memory scsihw = "virtio-scsi-pci" - boot = "order=scsi0" + boot = "order=virtio0" + bootdisk = "virtio0" ipconfig0 = "ip=dhcp" cicustom = "user=local:snippets/cloud_init_global.yaml" - disks { - scsi { - scsi0 { - disk { - size = var.disk_size - storage = var.storage - } - } - scsi1 { - cloudinit { - storage = var.storage - } +disks { + virtio { + virtio0 { + disk { + size = var.disk_size + storage = var.storage } } } + ide { + ide2 { + cloudinit { + storage = var.storage + } + } + } +} + network { id = 0 model = "virtio" @@ -71,26 +75,31 @@ resource "proxmox_vm_qemu" "llamas" { cores = var.cores memory = var.memory scsihw = "virtio-scsi-pci" - boot = "order=scsi0" + boot = "order=virtio0" + bootdisk = "virtio0" ipconfig0 = "ip=dhcp" cicustom = "user=local:snippets/cloud_init_global.yaml" - disks { - scsi { - scsi0 { - disk { - size = var.disk_size - storage = var.storage - } - } - scsi1 { - cloudinit { - storage = var.storage - } +disks { + virtio { + virtio0 { + disk { + size = var.disk_size + storage = var.storage } } } + ide { + ide2 { + cloudinit { + storage = var.storage + } + } + } +} + + network { id = 0 model = "virtio" From 080752e8a0868c66225e1746d4c2e0f90bb01dcd Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Fri, 18 Apr 2025 12:12:52 +0100 Subject: [PATCH 2/2] Worflow: changes vars --- terraform/main.tf | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/terraform/main.tf b/terraform/main.tf index fd9af06..bfca2ee 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -28,30 +28,30 @@ resource "proxmox_vm_qemu" "alpacas" { cores = var.cores memory = var.memory scsihw = "virtio-scsi-pci" - boot = "order=virtio0" - bootdisk = "virtio0" + boot = "order=virtio0" + bootdisk = "virtio0" ipconfig0 = "ip=dhcp" cicustom = "user=local:snippets/cloud_init_global.yaml" -disks { - virtio { - virtio0 { - disk { - size = var.disk_size - storage = var.storage + disks { + virtio { + virtio0 { + disk { + size = var.disk_size + storage = var.storage + } } } - } - ide { - ide2 { - cloudinit { - storage = var.storage + ide { + ide2 { + cloudinit { + storage = var.storage + } } } } -} network { id = 0 @@ -75,29 +75,29 @@ resource "proxmox_vm_qemu" "llamas" { cores = var.cores memory = var.memory scsihw = "virtio-scsi-pci" - boot = "order=virtio0" - bootdisk = "virtio0" + boot = "order=virtio0" + bootdisk = "virtio0" ipconfig0 = "ip=dhcp" cicustom = "user=local:snippets/cloud_init_global.yaml" -disks { - virtio { - virtio0 { - disk { - size = var.disk_size - storage = var.storage + disks { + virtio { + virtio0 { + disk { + size = var.disk_size + storage = var.storage + } } } - } - ide { - ide2 { - cloudinit { - storage = var.storage + ide { + ide2 { + cloudinit { + storage = var.storage + } } } } -} network {