terraform: fix file provisioning for worker and provisioner

Signed-off-by: Marques Johansson <[email protected]>
tinkerbell · Sep 4, 2020 · 5d9099c · 5d9099c
1 parent 41d92cd
commit 5d9099c
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/deploy/terraform/main.tf b/deploy/terraform/main.tf
@@ -40,14 +40,30 @@ resource "null_resource" "tink_directory" {
     host = packet_device.tink_provisioner.network[0].address
   }
 
+  provisioner "remote-exec" {
+    inline = [
+      "mkdir -p /root/tink/deploy"
+    ]
+  }
+
+  provisioner "file" {
+    source      = "../../setup.sh"
+    destination = "/root/tink/setup.sh"
+  }
+
+  provisioner "file" {
+    source      = "../../generate-envrc.sh"
+    destination = "/root/tink/generate-envrc.sh"
+  }
+
   provisioner "file" {
-    source      = "./../../../tink"
-    destination = "/root/"
+    source      = "../../deploy"
+    destination = "/root/tink"
   }
 
   provisioner "remote-exec" {
     inline = [
-      "chmod +x tink/generate-envrc.sh tink/setup.sh tink/deploy/tls/*.sh"
+      "chmod +x /root/tink/*.sh /root/tink/deploy/tls/*.sh"
     ]
   }
 }
@@ -109,7 +125,9 @@ data "template_file" "worker_hardware_data" {
 }
 
 resource "null_resource" "hardware_data" {
-  count = var.worker_count
+  count      = var.worker_count
+  depends_on = [null_resource.tink_directory]
+
   connection {
     type = "ssh"
     user = var.ssh_user