func: move /etc and update all paths

e2e/terraform/compute.tf

@@ -39,6 +39,8 @@ resource "aws_instance" "client_ubuntu_jammy_amd64" {
   }
 }
 
+
+
 resource "aws_instance" "client_windows_2016_amd64" {
   ami                    = data.aws_ami.windows_2016_amd64[0].image_id
   instance_type          = var.instance_type
@@ -98,10 +100,10 @@ data "aws_ami" "ubuntu_jammy_amd64" {
     values = ["Ubuntu"]
   }
 
-  filter {
+  /* filter {
     name   = "tag:BuilderSha"
     values = [data.external.packer_sha.result["sha"]]
-  }
+  } */
 }
 
 data "aws_ami" "windows_2016_amd64" {

e2e/terraform/consul-clients.tf

@@ -48,7 +48,7 @@ resource "local_sensitive_file" "consul_agents_cert" {
 resource "random_uuid" "consul_agent_token" {}
 
 resource "local_sensitive_file" "consul_agent_config_file" {
-  content = templatefile("${path.module}/etc/consul.d/clients.hcl", {
+  content = templatefile("${path.module}/provision-nomad/etc/consul.d/clients.hcl", {
     token          = "${random_uuid.consul_agent_token.result}"
     autojoin_value = "auto-join-${local.random_name}"
   })
@@ -61,7 +61,7 @@ resource "local_sensitive_file" "consul_agent_config_file" {
 resource "random_uuid" "consul_token_for_nomad" {}
 
 resource "local_sensitive_file" "nomad_client_config_for_consul" {
-  content = templatefile("${path.module}/etc/nomad.d/client-consul.hcl", {
+  content = templatefile("${path.module}/provision-nomad/etc/nomad.d/client-consul.hcl", {
     token               = "${random_uuid.consul_token_for_nomad.result}"
     client_service_name = "client-${local.random_name}"
     server_service_name = "server-${local.random_name}"
@@ -71,7 +71,7 @@ resource "local_sensitive_file" "nomad_client_config_for_consul" {
 }
 
 resource "local_sensitive_file" "nomad_server_config_for_consul" {
-  content = templatefile("${path.module}/etc/nomad.d/server-consul.hcl", {
+  content = templatefile("${path.module}/provision-nomad/etc/nomad.d/server-consul.hcl", {
     token               = "${random_uuid.consul_token_for_nomad.result}"
     client_service_name = "client-${local.random_name}"
     server_service_name = "server-${local.random_name}"

e2e/terraform/consul-servers.tf

@@ -15,7 +15,7 @@ resource "local_sensitive_file" "consul_initial_management_token" {
 }
 
 resource "local_sensitive_file" "consul_server_config_file" {
-  content = templatefile("${path.module}/etc/consul.d/servers.hcl", {
+  content = templatefile("${path.module}/provision-nomad/etc/consul.d/servers.hcl", {
     management_token = "${random_uuid.consul_initial_management_token.result}"
     token            = "${random_uuid.consul_agent_token.result}"
     nomad_token      = "${random_uuid.consul_token_for_nomad.result}"
@@ -69,7 +69,7 @@ resource "local_sensitive_file" "consul_server_cert" {
 
 # if consul_license is unset, it'll be a harmless empty license file
 resource "local_sensitive_file" "consul_environment" {
-  content = templatefile("${path.module}/etc/consul.d/.environment", {
+  content = templatefile("${path.module}/provision-nomad/etc/consul.d/.environment", {
     license = var.consul_license
   })
   filename        = "uploads/shared/consul.d/.environment"
@@ -117,7 +117,7 @@ resource "null_resource" "upload_consul_server_configs" {
     destination = "/tmp/consul_server.hcl"
   }
   provisioner "file" {
-    source      = "${path.module}/etc/consul.d/consul-server.service"
+    source      = "${path.module}/provision-nomad/etc/consul.d/consul-server.service"
     destination = "/tmp/consul.service"
   }
 }