From 30273d9256b1c32ef0766b9909964b1d454eca17 Mon Sep 17 00:00:00 2001
From: James Rasell <jrasell@hashicorp.com>
Date: Thu, 16 Sep 2021 17:15:41 +0200
Subject: [PATCH] e2e: fix provisioning when ACLs and TLS enabled; no nightly
 TLS.

---
 e2e/terraform/nomad-acls.tf         | 6 +++++-
 e2e/terraform/terraform.full.tfvars | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/e2e/terraform/nomad-acls.tf b/e2e/terraform/nomad-acls.tf
index 41b84f31c..96a11c6b9 100644
--- a/e2e/terraform/nomad-acls.tf
+++ b/e2e/terraform/nomad-acls.tf
@@ -5,6 +5,10 @@
 # So we run a bootstrapping script and write our management token into a file
 # that we read in for the output of $(terraform output environment) later.
 
+locals {
+  nomad_env = var.tls ? "NOMAD_ADDR=https://${aws_instance.server.0.public_ip}:4646 NOMAD_CACERT=keys/tls_ca.crt NOMAD_CLIENT_CERT=keys/tls_api_client.crt NOMAD_CLIENT_KEY=keys/tls_api_client.key" : "NOMAD_ADDR=http://${aws_instance.server.0.public_ip}:4646"
+}
+
 resource "null_resource" "bootstrap_nomad_acls" {
   depends_on = [module.nomad_server]
   triggers = {
@@ -20,7 +24,7 @@ resource "null_resource" "bootstrap_nomad_acls" {
 # so that we can read it into the data.local_file later. If not set,
 # ensure that it's empty.
 data "template_file" "bootstrap_nomad_script" {
-  template = var.nomad_acls ? "NOMAD_ADDR=http://${aws_instance.server.0.public_ip}:4646 ./scripts/bootstrap-nomad.sh" : "mkdir -p ${path.root}/keys; echo > ${path.root}/keys/nomad_root_token"
+  template = var.nomad_acls ? "${local.nomad_env} ./scripts/bootstrap-nomad.sh" : "mkdir -p ${path.root}/keys; echo > ${path.root}/keys/nomad_root_token"
 }
 
 data "local_file" "nomad_token" {
diff --git a/e2e/terraform/terraform.full.tfvars b/e2e/terraform/terraform.full.tfvars
index 50191bd27..d50ce40dd 100644
--- a/e2e/terraform/terraform.full.tfvars
+++ b/e2e/terraform/terraform.full.tfvars
@@ -8,6 +8,7 @@ nomad_enterprise                 = true
 nomad_acls                       = true
 vault                            = true
 volumes                          = true
+tls                              = false
 
 # required to avoid picking up defaults from terraform.tfvars file
 nomad_version      = "" # default version for deployment