Fix Terraform setup

deploy/terraform/main.tf

@@ -10,43 +10,46 @@ provider "packet" {
 }
 
 # Create a new VLAN in datacenter "ewr1"
-resource "packet_vlan" "provisioning-vlan" {
-  description = "provisioning-vlan"
+resource "packet_vlan" "provisioning_vlan" {
+  description = "provisioning_vlan"
   facility    = var.facility
   project_id  = var.project_id
 }
 
 # Create a device and add it to tf_project_1
-resource "packet_device" "tink-provisioner" {
+resource "packet_device" "tink_provisioner" {
   hostname         = "tink-provisioner"
   plan             = var.device_type
   facilities       = [var.facility]
   operating_system = "ubuntu_18_04"
   billing_cycle    = "hourly"
   project_id       = var.project_id
   user_data        = file("install_package.sh")
+}
+
+resource "null_resource" "tink_directory" {
+  connection {
+    type = "ssh"
+    user = var.ssh_user
+    host = packet_device.tink_provisioner.network[0].address
+  }
 
   provisioner "file" {
     source      = "./../../../tink"
     destination = "/root/"
-
-    connection {
-      type        = "ssh"
-      user        = var.ssh_user
-      host        = packet_device.tink-provisioner.network[0].address
-      private_key = file(var.ssh_private_key)
-    }
   }
 }
 
-resource "packet_device_network_type" "tink-provisioner-network-type" {
-  device_id = packet_device.tink-provisioner.id
+resource "packet_device_network_type" "tink_provisioner_network_type" {
+  device_id = packet_device.tink_provisioner.id
   type      = "hybrid"
 }
 
 # Create a device and add it to tf_project_1
-resource "packet_device" "tink-worker" {
-  hostname         = "tink-worker"
+resource "packet_device" "tink_worker" {
+  count = var.worker_count
+
+  hostname         = "tink-worker-${count.index}"
   plan             = var.device_type
   facilities       = [var.facility]
   operating_system = "custom_ipxe"
@@ -56,21 +59,25 @@ resource "packet_device" "tink-worker" {
   project_id       = var.project_id
 }
 
-resource "packet_device_network_type" "tink-worker-network-type" {
-  device_id = packet_device.tink-worker.id
+resource "packet_device_network_type" "tink_worker_network_type" {
+  count = var.worker_count
+
+  device_id = packet_device.tink_worker[count.index].id
   type      = "layer2-individual"
 }
 
 # Attach VLAN to provisioner
 resource "packet_port_vlan_attachment" "provisioner" {
-  device_id = packet_device.tink-provisioner.id
+  device_id = packet_device.tink_provisioner.id
   port_name = "eth1"
-  vlan_vnid = packet_vlan.provisioning-vlan.vxlan
+  vlan_vnid = packet_vlan.provisioning_vlan.vxlan
 }
 
 # Attach VLAN to worker
 resource "packet_port_vlan_attachment" "worker" {
-  device_id = packet_device.tink-worker.id
+  count = var.worker_count
+
+  device_id = packet_device.tink_worker[count.index].id
   port_name = "eth0"
-  vlan_vnid = packet_vlan.provisioning-vlan.vxlan
+  vlan_vnid = packet_vlan.provisioning_vlan.vxlan
 }

deploy/terraform/outputs.tf

@@ -1,11 +1,11 @@
 output "provisioner_dns_name" {
-  value = "${split("-", packet_device.tink-provisioner.id)[0]}.packethost.net"
+  value = "${split("-", packet_device.tink_provisioner.id)[0]}.packethost.net"
 }
 
 output "provisioner_ip" {
-  value = packet_device.tink-provisioner.network[0].address
+  value = packet_device.tink_provisioner.network[0].address
 }
 
 output "worker_mac_addr" {
-  value = packet_device.tink-worker.ports[1].mac
+  value = packet_device.tink_worker[0].ports[1].mac
 }

deploy/terraform/variables.tf

@@ -8,6 +8,11 @@ variable "project_id" {
   type        = string
 }
 
+variable "worker_count" {
+  description = "Number of Workers"
+  type        = number
+  default     = 1
+}
 variable "facility" {
   description = "Packet facility to provision in"
   type        = string
@@ -25,9 +30,3 @@ variable "ssh_user" {
   type        = string
   default     = "root"
 }
-
-variable "ssh_private_key" {
-  description = "privatekey that will be used to transfer file from your local environment to the provisioner via ssh"
-  type        = string
-  default     = "~/.ssh/id_rsa"
-}