Skip to content

Commit

Permalink
Merge pull request #4 from rkoosaar/automated-terraform-fmt
Browse files Browse the repository at this point in the history 
Reformat terraform files
  • Loading branch information
@rkoosaar
rkoosaar authored Apr 25, 2022
2 parents dd99f31 + e07ea2f commit 4a14cb3
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 85 deletions.
64 changes: 32 additions & 32 deletions examples/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ module "prx_vm" {
desc = "TEST Server"

define_connection_info = "true"
bios = "seabios"
onboot = false
oncreate = false
tablet = true
boot = "cdn"
bootdisk = "scsi0"
agent = 1
iso = "pve-data:iso/debian-11.0.0-amd64-netinst.iso"
bios = "seabios"
onboot = false
oncreate = false
tablet = true
boot = "cdn"
bootdisk = "scsi0"
agent = 1
iso = "pve-data:iso/debian-11.0.0-amd64-netinst.iso"
#pxe = false
#clone = "centos-x64-template"
full_clone = false
memory = 768
sockets = "1"
cores = 2
vcpus = 2
cpu = "host"
scsihw = "virtio-scsi-pci"
full_clone = false
memory = 768
sockets = "1"
cores = 2
vcpus = 2
cpu = "host"
scsihw = "virtio-scsi-pci"
force_create = false
#os_type = "ubuntu"
automatic_reboot = true
automatic_reboot = true

# Cloud init specific
sshkeys = "ssh-ed25519 AAAAC3NzaC1l7faf6a69UIATUDABIBTrVBGFSDAGLRJ+JjqB0+bgaKW80W6bxv407PzS [email protected]"
Expand All @@ -42,30 +42,30 @@ module "prx_vm" {
# vm_disk
vm_disk = [
{
type = "scsi"
storage = "pve-data"
size = "40G"
format = "qcow2"
type = "scsi"
storage = "pve-data"
size = "40G"
format = "qcow2"
},
{
type = "scsi"
storage = "pve-data"
size = "20G"
format = "qcow2"
type = "scsi"
storage = "pve-data"
size = "20G"
format = "qcow2"
}
]

# vm_network
vm_network = [
{
id = 0
model = "virtio"
bridge = "vmbr1"
{
id = 0
model = "virtio"
bridge = "vmbr1"
},
{
id = 1
model = "virtio"
bridge = "vmbr0"
{
id = 1
model = "virtio"
bridge = "vmbr0"
},
]
}
34 changes: 17 additions & 17 deletions locals.tf
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
locals {
# vm_disk
vm_disk = var.vm_disk
vm_disk_default_type = var.vm_disk_default_type
vm_disk_default_storage = var.vm_disk_default_storage
vm_disk_default_size = var.vm_disk_default_size
vm_disk_default_format = var.vm_disk_default_format
vm_disk_default_cache = var.vm_disk_default_cache
vm_disk_default_backup = var.vm_disk_default_backup
vm_disk_default_iothread = var.vm_disk_default_iothread
vm_disk_default_replicate = var.vm_disk_default_replicate
vm_disk_default_ssd = var.vm_disk_default_ssd
vm_disk_default_discard = var.vm_disk_default_discard
vm_disk_default_mbps = var.vm_disk_default_mbps
vm_disk_default_mbps_rd = var.vm_disk_default_mbps_rd
vm_disk_default_mbps_rd_max = var.vm_disk_default_mbps_rd_max
vm_disk_default_mbps_wr = var.vm_disk_default_mbps_wr
vm_disk_default_mbps_wr_max = var.vm_disk_default_mbps_wr_max
vm_disk = var.vm_disk
vm_disk_default_type = var.vm_disk_default_type
vm_disk_default_storage = var.vm_disk_default_storage
vm_disk_default_size = var.vm_disk_default_size
vm_disk_default_format = var.vm_disk_default_format
vm_disk_default_cache = var.vm_disk_default_cache
vm_disk_default_backup = var.vm_disk_default_backup
vm_disk_default_iothread = var.vm_disk_default_iothread
vm_disk_default_replicate = var.vm_disk_default_replicate
vm_disk_default_ssd = var.vm_disk_default_ssd
vm_disk_default_discard = var.vm_disk_default_discard
vm_disk_default_mbps = var.vm_disk_default_mbps
vm_disk_default_mbps_rd = var.vm_disk_default_mbps_rd
vm_disk_default_mbps_rd_max = var.vm_disk_default_mbps_rd_max
vm_disk_default_mbps_wr = var.vm_disk_default_mbps_wr
vm_disk_default_mbps_wr_max = var.vm_disk_default_mbps_wr_max

vm_disk_default_file = var.vm_disk_default_file
vm_disk_default_media = var.vm_disk_default_media
Expand All @@ -32,7 +32,7 @@ locals {
vm_network_default_rate = var.vm_network_default_rate
vm_network_default_queues = var.vm_network_default_queues
vm_network_default_link_down = var.vm_network_default_link_down

# lifecycle - not in use
// vm_lifecycle {
// ignore_changes = var.ignore_changes
Expand Down
68 changes: 34 additions & 34 deletions main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
resource "proxmox_vm_qemu" "vm_qemu" {
count = var.vm_enable ? 1 : 0

name = var.name
target_node = var.target_node
vmid = var.vmid
desc = var.desc
name = var.name
target_node = var.target_node
vmid = var.vmid
desc = var.desc
define_connection_info = var.define_connection_info

bios = var.bios
Expand All @@ -14,9 +14,9 @@ resource "proxmox_vm_qemu" "vm_qemu" {
boot = var.boot
bootdisk = var.bootdisk

agent = var.agent
iso = var.iso
pxe = var.pxe
agent = var.agent
iso = var.iso
pxe = var.pxe
clone = var.clone
full_clone = var.full_clone

Expand All @@ -37,32 +37,32 @@ resource "proxmox_vm_qemu" "vm_qemu" {
hotplug = var.hotplug
scsihw = var.scsihw

pool = var.pool
tags = var.tags
force_create = var.force_create
os_type = var.os_type
pool = var.pool
tags = var.tags
force_create = var.force_create
os_type = var.os_type
force_recreate_on_change_of = var.force_recreate_on_change_of
os_network_config = var.os_network_config
ssh_forward_ip = var.ssh_forward_ip
ssh_user = var.ssh_user
ssh_private_key = var.ssh_private_key
os_network_config = var.os_network_config

ssh_forward_ip = var.ssh_forward_ip
ssh_user = var.ssh_user
ssh_private_key = var.ssh_private_key

# for Cloud-init Settings.
ci_wait = var.ci_wait
ciuser = var.ciuser
cipassword = var.cipassword
cicustom = var.cicustom
searchdomain = var.searchdomain
nameserver = var.nameserver
sshkeys = <<EOF
ci_wait = var.ci_wait
ciuser = var.ciuser
cipassword = var.cipassword
cicustom = var.cicustom
searchdomain = var.searchdomain
nameserver = var.nameserver
sshkeys = <<EOF
${var.sshkeys}
EOF
ipconfig0 = var.ipconfig0
ipconfig1 = var.ipconfig1
ipconfig2 = var.ipconfig2
ipconfig3 = var.ipconfig3
ipconfig4 = var.ipconfig4
ipconfig0 = var.ipconfig0
ipconfig1 = var.ipconfig1
ipconfig2 = var.ipconfig2
ipconfig3 = var.ipconfig3
ipconfig4 = var.ipconfig4
automatic_reboot = var.automatic_reboot


Expand Down Expand Up @@ -124,17 +124,17 @@ resource "proxmox_vm_qemu" "vm_qemu" {
dynamic "usb" {
for_each = var.usb == null ? [] : list(var.usb)
content {
host = usb.value.host
host = usb.value.host
usb3 = usb.value.usb3
}
}

# these may need to be adjusted
lifecycle {
ignore_changes = [network,ciuser]
// ignore_changes = [network,disk,ciuser]
//create_before_destroy = false
//prevent_destroy = false
ignore_changes = [network, ciuser]
// ignore_changes = [network,disk,ciuser]
//create_before_destroy = false
//prevent_destroy = false
}

}
2 changes: 1 addition & 1 deletion providers.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_version = ">= 1.0.0"
required_providers {
proxmox = {
source = "telmate/proxmox"
source = "telmate/proxmox"
version = ">= 2.9.9"
}
}
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ variable "serial" {
variable "usb" {
description = "The usb block is used to configure USB devices."
type = object({
host = string
host = string
usb3 = bool
})
default = null
Expand Down

0 comments on commit 4a14cb3

Please sign in to comment.