Move stuff around + cleanup

terraform/modules/nfs/variable.tf

@@ -25,4 +25,4 @@ variable "host" {
     user = string
     is_windows = bool
   })
-}
+}

terraform/modules/single_instance/ansible.tf

@@ -5,4 +5,22 @@ locals {
     ANSIBLE_HOST_KEY_CHECKING = false
   }
   ansible_command="timeout 4m ansible-playbook -c ssh -i ${data.openstack_networking_floatingip_v2.public.address},"
+}
+resource "null_resource" "testconnection" {
+  count = var.is_windows ? 0 : 1
+  depends_on = [ openstack_compute_instance_v2.instance_01 ]
+  triggers = {
+    user = local.ssh_user
+    port = local.ports.ssh
+    ip = data.openstack_networking_floatingip_v2.public.address
+  }
+  provisioner "remote-exec" {
+    connection {
+      user     = self.triggers.user
+      host     = self.triggers.ip
+      port = self.triggers.port
+      timeout = "5m"
+    }
+    inline = ["echo 'connected!'"]
+  }
 }

terraform/modules/single_instance/cloudinit.tf

@@ -4,8 +4,7 @@ data "cloudinit_config" "main" {
   part {
     filename     = "cloud-config.yaml"
     content_type = "text/cloud-config"
-
-    content = templatefile("${local.scripts_dir}/cloud-config.yaml", { files = data.local_file.ansible })
+    content = file("${local.scripts_dir}/cloud-config.yaml")
   }
   part {
     filename     = "userscript.sh"
@@ -21,49 +20,3 @@ data "cloudinit_config" "main" {
     }
   }
 }
-locals {
-  ansible_files = fileset("${local.scripts_dir}/ansible/", "**")
-}
-data "local_file" "ansible" {
-  for_each = local.ansible_files
-  filename = "${local.scripts_dir}/ansible/${each.value}"
-}
-
-resource "null_resource" "testconnection" {
-  count = var.is_windows ? 0 : 1
-  depends_on = [ openstack_compute_instance_v2.instance_01 ]
-  triggers = {
-    user = local.ssh_user
-    port = local.ports.ssh
-    ip = data.openstack_networking_floatingip_v2.public.address
-  }
-  provisioner "remote-exec" {
-    connection {
-      user     = self.triggers.user
-      host     = self.triggers.ip
-      port = self.triggers.port
-      timeout = "5m"
-    }
-    inline = ["echo 'connected!'"]
-  }
-}
-resource "null_resource" "nginx" {
-  count = ( var.nginx_enabled && !var.is_windows) ? 1 : 0
-  triggers = {
-    enabled = var.nginx_enabled
-    scripts_dir = local.scripts_dir
-    ansible_command = local.ansible_command
-    environment = jsonencode(local.ansible_env)
-  }
-  depends_on = [ null_resource.testconnection ]
-  provisioner "local-exec" {
-    environment = jsondecode(self.triggers.environment)
-    command = "${self.triggers.ansible_command} ${self.triggers.scripts_dir}/ansible/nginx.yaml --extra-vars install=${self.triggers.enabled}"
-  }
-  provisioner "local-exec" {
-    environment = jsondecode(self.triggers.environment)
-    when = destroy
-    on_failure = continue
-    command=  "${self.triggers.ansible_command} ${self.triggers.scripts_dir}/ansible/nginx.yaml --extra-vars install=false"
-  }
-}

terraform/modules/single_instance/http.tf

@@ -59,4 +59,24 @@ resource "openstack_networking_secgroup_rule_v2" "https" {
   remote_ip_prefix  = "0.0.0.0/0"
   security_group_id = openstack_networking_secgroup_v2.secgroup.id
   description = "${data.openstack_identity_auth_scope_v3.scope.user_name}-${var.vm_name}-http"
+}
+resource "null_resource" "nginx" {
+  count = ( var.nginx_enabled && !var.is_windows) ? 1 : 0
+  triggers = {
+    enabled = var.nginx_enabled
+    scripts_dir = local.scripts_dir
+    ansible_command = local.ansible_command
+    environment = jsonencode(local.ansible_env)
+  }
+  depends_on = [ null_resource.testconnection ]
+  provisioner "local-exec" {
+    environment = jsondecode(self.triggers.environment)
+    command = "${self.triggers.ansible_command} ${self.triggers.scripts_dir}/ansible/nginx.yaml --extra-vars install=${self.triggers.enabled}"
+  }
+  provisioner "local-exec" {
+    environment = jsondecode(self.triggers.environment)
+    when = destroy
+    on_failure = continue
+    command=  "${self.triggers.ansible_command} ${self.triggers.scripts_dir}/ansible/nginx.yaml --extra-vars install=false"
+  }
 }

terraform/modules/single_instance/scripts/cloud-config.yaml

@@ -3,26 +3,5 @@ packages:
   - curl
   - jq
   - nfs-common
-
-# write_files:
-# %{ for file in files }
-# - encoding: b64
-#   content: ${ file.content_base64 }
-#   owner: root:root
-#   path: /opt/vsc/ansible/${basename(file.filename)}
-#   permissions: '0770'
-# %{ endfor }
-# - content: |
-#     [defaults]
-#     localhost_warning=False
-#     collections_on_ansible_version_mismatch=ignore
-
-#     [inventory]
-#     inventory_unparsed_warning=False
-#   path: /etc/ansible/ansible.cfg
 runcmd:
 - [mkdir,-p,/opt/vsc/cron]
-- [mkdir,-p,/opt/vsc/cron/]
-
-# - ["ansible-galaxy", "collection", "install", "ansible.posix"]
-# - ["ansible-galaxy", "collection", "install", "community.general"]