func: update paths

hashicorp · Dec 17, 2024 · 77148be · 77148be
1 parent dc29bdb
commit 77148be
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 161 deletions.
diff --git a/e2e/terraform/.terraform.lock.hcl b/e2e/terraform/.terraform.lock.hcl
diff --git a/e2e/terraform/csi/input/volume-efs.hcl b/e2e/terraform/csi/input/volume-efs.hcl
@@ -0,0 +1,15 @@
+type        = "csi"
+id          = "efs-vol0"
+name        = "efs-vol0"
+external_id = "fs-04c1d811ee34b324b"
+plugin_id   = "aws-efs0"
+
+capability {
+  access_mode     = "single-node-writer"
+  attachment_mode = "file-system"
+}
+
+capability {
+  access_mode     = "single-node-reader"
+  attachment_mode = "file-system"
+}
diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf
@@ -9,4 +9,6 @@ module "provision-infra" {
   client_count_linux =  var.client_count_linux
   client_count_windows_2016_amd64 = var.client_count_windows_2016_amd64
   nomad_local_binary = var.nomad_local_binary
+  nomad_license = var.nomad_license
+  consul_license = var.consul_license
 }
diff --git a/e2e/terraform/provision-infra/nomad-acls.tf b/e2e/terraform/provision-infra/nomad-acls.tf
@@ -11,7 +11,7 @@ resource "null_resource" "bootstrap_nomad_acls" {
   depends_on = [module.nomad_server, null_resource.bootstrap_consul_acls]
 
   provisioner "local-exec" {
-    command = "./scripts/bootstrap-nomad.sh"
+    command = "${path.module}/scripts/bootstrap-nomad.sh"
     environment = {
       NOMAD_ADDR        = "https://${aws_instance.server.0.public_ip}:4646"
       NOMAD_CACERT      = "${path.root}/keys/tls_ca.crt"

diff --git a/e2e/terraform/provision-infra/nomad.tf b/e2e/terraform/provision-infra/nomad.tf
@@ -72,6 +72,7 @@ module "nomad_client_windows_2016_amd64" {
   instance = aws_instance.client_windows_2016_amd64[count.index]
 
   nomad_region       = var.nomad_region
+  nomad_license      = var.nomad_license
   nomad_local_binary = count.index < length(var.nomad_local_binary_client_windows_2016_amd64) ? var.nomad_local_binary_client_windows_2016_amd64[count.index] : ""
 
   tls_ca_key  = tls_private_key.ca.private_key_pem

diff --git a/e2e/terraform/provision-infra/provision-nomad/variables.tf b/e2e/terraform/provision-infra/provision-nomad/variables.tf
@@ -16,7 +16,6 @@ variable "nomad_local_binary" {
 variable "nomad_license" {
   type        = string
   description = "The enterprise license to use. overrides Nomad temporary license"
-  default     = ""
 }
 
 variable "tls_ca_algorithm" {
@@ -28,13 +27,11 @@ variable "tls_ca_algorithm" {
 variable "tls_ca_key" {
   type        = string
   description = "Cluster TLS CA private key"
-  default     = ""
 }
 
 variable "tls_ca_cert" {
   type        = string
   description = "Cluster TLS CA cert"
-  default     = ""
 }
 
 variable "arch" {

diff --git a/e2e/terraform/provision-infra/scripts/bootstrap-nomad.sh b/e2e/terraform/provision-infra/scripts/bootstrap-nomad.sh
@@ -9,6 +9,10 @@ while true :
 do
     ROOT_TOKEN=$(nomad acl bootstrap | awk '/Secret ID/{print $4}')
     if [ ! -z $ROOT_TOKEN ]; then break; fi
+    echo NOMAD_ADDR = $NOMAD_ADDR
+    echo NOMAD_CACERT = $NOMAD_CACERT
+    echo NOMAD_CLIENT_CERT = $NOMAD_CLIENT_CERT
+    echo NOMAD_CLIENT_KEY = $NOMAD_CLIENT_KEY
     sleep 5
 done
 set -e

diff --git a/e2e/terraform/remotetasks/input/ecs.vars b/e2e/terraform/remotetasks/input/ecs.vars
@@ -0,0 +1,2 @@
+security_groups = ["sg-0ed9eef003515cd1d"]
+subnets         = ["subnet-d5c50df4"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		security_groups = ["sg-0ed9eef003515cd1d"]
		subnets = ["subnet-d5c50df4"]