Merge pull request #30 from wenzel-felix/feature/migrate2templatefile…

…function removed the deprecated data source template file and added templatefile function instead also activated firewall
wenzel-felix · Feb 10, 2023 · f54b89d · f54b89d
2 parents 6bf3a07 + 22186b8
commit f54b89d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/hcloud_firewall.tf b/hcloud_firewall.tf
@@ -1,4 +1,4 @@
-/* resource "hcloud_firewall" "default" {
+resource "hcloud_firewall" "default" {
   name = "default-firewall"
   rule {
     direction = "in"
@@ -18,4 +18,4 @@ resource "hcloud_firewall_attachment" "default" {
   ]
   firewall_id = hcloud_firewall.default.id
   label_selectors = [ "nomad-server", "nomad-client", "vault-server" ]
-} */
+}
diff --git a/hcloud_server.tf b/hcloud_server.tf
@@ -4,7 +4,7 @@ resource "hcloud_server" "main" {
     hcloud_server.vault
   ]
   for_each    = local.Aggregator_Data
-  name        = "${each.key}"
+  name        = each.key
   server_type = "cpx11"
   image       = "ubuntu-20.04"
   location    = var.hetzner_datacenter
@@ -40,7 +40,21 @@ resource "null_resource" "deployment" {
   }
 
   provisioner "file" {
-    content     = join("\n", [file("${path.module}/scripts/base_configuration.sh"), data.template_file.base_configuration[each.key].rendered])
+    content = join("\n", [file("${path.module}/scripts/base_configuration.sh"),
+      each.value.type == "server" ? templatefile("${path.module}/scripts/server_setup.sh",
+        {
+          VAULT_IP     = hcloud_server.vault.ipv4_address
+          SERVER_COUNT = length(local.Server_Count)
+          IP_RANGE     = local.IP_range
+          SERVER_IPs   = jsonencode([for key, value in local.Extended_Aggregator_IPs : value.private_ipv4[0] if value.type == "server"])
+        }) : templatefile("${path.module}/scripts/client_setup.sh",
+        {
+          VAULT_IP     = hcloud_server.vault.ipv4_address
+          SERVER_COUNT = length(local.Server_Count)
+          IP_RANGE     = local.IP_range
+          SERVER_IPs   = jsonencode([for key, value in local.Extended_Aggregator_IPs : value.private_ipv4[0] if value.type == "server"])
+      })
+    ])
     destination = "setup.sh"
   }
 
@@ -91,6 +105,6 @@ resource "null_resource" "clean_up" {
       rm -f ${path.root}/certs/nomad_token
       rm -f ${path.root}/certs/machines.pem
     EOF
-    when = destroy
+    when    = destroy
   }
-}
+}
diff --git a/main.tf b/main.tf
@@ -30,15 +30,4 @@ locals {
       "id"           = value.id
     }
   }
-}
-
-data "template_file" "base_configuration" {
-  for_each = local.Aggregator_Data
-  template = each.value.type == "server" ? file("${path.module}/scripts/server_setup.sh") : file("${path.module}/scripts/client_setup.sh")
-  vars = {
-    VAULT_IP = hcloud_server.vault.ipv4_address
-    SERVER_COUNT        = length(local.Server_Count)
-    IP_RANGE            = local.IP_range
-    SERVER_IPs          = jsonencode([for key, value in local.Extended_Aggregator_IPs : value.private_ipv4[0] if value.type == "server"])
-  }
 }