Compare commits

..

No commits in common. "080752e8a0868c66225e1746d4c2e0f90bb01dcd" and "7d04a2c4752ddcb9650dad2d98daf42a023ad3da" have entirely different histories.

2 changed files with 10 additions and 24 deletions

View File

@ -1,11 +1,4 @@
#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
@ -20,6 +13,7 @@ packages:
- jq
- curl
- qemu-guest-agent
- salt-minion
users:
- name: stuart
@ -30,6 +24,7 @@ users:
- ${SSH_KEY_PUBLIC}
preserve_hostname: false
manage_etc_hosts: false
fqdn: ${hostname}.${domain}
#cloud-config

View File

@ -28,24 +28,20 @@ resource "proxmox_vm_qemu" "alpacas" {
cores = var.cores
memory = var.memory
scsihw = "virtio-scsi-pci"
boot = "order=virtio0"
bootdisk = "virtio0"
boot = "order=scsi0"
ipconfig0 = "ip=dhcp"
cicustom = "user=local:snippets/cloud_init_global.yaml"
disks {
virtio {
virtio0 {
scsi {
scsi0 {
disk {
size = var.disk_size
storage = var.storage
}
}
}
ide {
ide2 {
scsi1 {
cloudinit {
storage = var.storage
}
@ -75,23 +71,19 @@ resource "proxmox_vm_qemu" "llamas" {
cores = var.cores
memory = var.memory
scsihw = "virtio-scsi-pci"
boot = "order=virtio0"
bootdisk = "virtio0"
boot = "order=scsi0"
ipconfig0 = "ip=dhcp"
cicustom = "user=local:snippets/cloud_init_global.yaml"
disks {
virtio {
virtio0 {
scsi {
scsi0 {
disk {
size = var.disk_size
storage = var.storage
}
}
}
ide {
ide2 {
scsi1 {
cloudinit {
storage = var.storage
}
@ -99,7 +91,6 @@ resource "proxmox_vm_qemu" "llamas" {
}
}
network {
id = 0
model = "virtio"