Compare commits

..

No commits in common. "84e45b4c61b3bf59210eaa1473ad78816376863c" and "bada1b69da17fa1073802870175e2d6a98ea8557" have entirely different histories.

2 changed files with 10 additions and 24 deletions

View File

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

View File

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