#35 #36 (#37)

* cleanup: removed epochs from README.md * #36 network.magcloud global vars, reduced dhcp resource allocation. * #35 template container for Ansible target * fix: remove var.root_pass to pass lint checks * Removed other line for lint checks * variables.tf fix from Cody * fix: variable names * fix: variable name revert, formatting cleanup, validation Co-authored-by: claughinghouse <[email protected]>
magfest · Jun 29, 2021 · 8731222 · 8731222
1 parent a8da10b
commit 8731222
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/terraform/dhcp.tf b/terraform/dhcp.tf
@@ -17,7 +17,6 @@ resource "proxmox_lxc" "dhcp" {
     tag      = each.value.vlan_id
   }
   ostemplate = each.value.ostemplate
-  password   = var.root_pass
   rootfs {
     storage = "ceph"
     size    = each.value.disk_size

diff --git a/terraform/test_lxc_instance.tf b/terraform/test_lxc_instance.tf
@@ -0,0 +1,23 @@
+resource "proxmox_lxc" "basic" {
+  count           = 1
+  target_node     = "pve1"
+  hostname        = "provisioning-template-${count.index}.magevent.net"
+  ostemplate      = "wowza:vztmpl/ubuntu-20.04-standard_20.04-1_amd64.tar.gz"
+  ssh_public_keys = var.common.ssh_public_keys
+  unprivileged    = true
+
+  // Terraform will crash without rootfs defined
+  rootfs {
+    storage = "ceph"
+    size    = "8G"
+  }
+
+  network {
+    name     = "eth0"
+    ip       = "dhcp"
+    bridge   = var.magcloud.bridge_id
+    gw       = var.magcloud.gateway
+    firewall = var.magcloud.firewall
+    tag      = var.magcloud.vlan_id
+  }
+}
diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -7,28 +7,30 @@ variable "common" {
     EOT
   }
 }
-
-variable "root_pass" {
-  type = string
+variable "magcloud" {
+  type = map(string)
+  default = {
+    network_interface = "eth0"
+    bridge_id         = "vmbr999"
+    cidr              = "10.101.22.0/24"
+    gateway           = "10.101.22.1"
+    firewall          = true
+    vlan_id           = "22"
+  }
 }
-
 variable "dhcp" {
   type = map(map(string))
   default = {
     dhcp1 = {
       hostname          = "dhcp1"
       target_node       = "pve1"
       vmid              = "7007"
-      memory            = "8192"
-      cores             = "4"
+      memory            = "1024"
+      cores             = "1"
       swap              = "512"
       start             = true
       network_interface = "eth0"
-      bridge_id         = "vmbr999"
       cidr              = "10.101.22.253/24"
-      gateway           = "10.101.22.1"
-      vlan_id           = "22"
-      firewall          = true
       ostemplate        = "wowza:vztmpl/ubuntu-20.04-standard_20.04-1_amd64.tar.gz"
       disk_size         = "8G"
       unprivileged      = true
@@ -37,16 +39,12 @@ variable "dhcp" {
       hostname          = "dhcp2"
       target_node       = "pve2"
       vmid              = "7008"
-      memory            = "8192"
-      cores             = "4"
+      memory            = "1024"
+      cores             = "1"
       swap              = "512"
       start             = true
       network_interface = "eth0"
-      bridge_id         = "vmbr999"
       cidr              = "10.101.22.254/24"
-      gateway           = "10.101.22.1"
-      vlan_id           = "22"
-      firewall          = true
       ostemplate        = "wowza:vztmpl/ubuntu-20.04-standard_20.04-1_amd64.tar.gz"
       disk_size         = "8G"
       unprivileged      = true