From 4084e82becac0300c9a81c441d45f501ad636fad Mon Sep 17 00:00:00 2001
From: "Christopher A. Snapp" <csnapp@chef.io>
Date: Fri, 15 Nov 2019 08:09:46 -0700
Subject: [PATCH] fix relative path to terraform modules

Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
---
 .expeditor/verify.pipeline.yml                              | 2 +-
 terraform/aws/Makefile                                      | 6 +++---
 terraform/aws/scenarios/omnibus-external-openldap/main.tf   | 6 +++---
 .../omnibus-standalone-upgrade-from-stable/main.tf          | 2 +-
 .../aws/scenarios/omnibus-tiered-fresh-install/main.tf      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 05e09b5744b..7b69548ec91 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -12,7 +12,7 @@ steps:
 
 - label: lint-terraform
   command:
-    - cd /workdir/terraform
+    - cd /workdir/terraform/aws
     - make lint
   expeditor:
     executor:
diff --git a/terraform/aws/Makefile b/terraform/aws/Makefile
index 5e0536d0029..48acdd1b8b6 100644
--- a/terraform/aws/Makefile
+++ b/terraform/aws/Makefile
@@ -74,19 +74,19 @@ endif
 
 create-vpc: verify-aws
 	@set -e; \
-	cd aws_vpc && \
+	cd modules/aws_vpc && \
 	rm -rf .terraform && \
 	terraform init && \
 	terraform apply -auto-approve
 
 show-vpc: verify-aws
 	@set -e; \
-	cd aws_vpc && \
+	cd modules/aws_vpc && \
 	terraform show
 
 destroy-vpc: verify-aws
 	@set -e; \
-	cd aws_vpc && \
+	cd modules/aws_vpc && \
 	terraform destroy -auto-approve && \
 	rm -rf .terraform terraform.tfstate*
 
diff --git a/terraform/aws/scenarios/omnibus-external-openldap/main.tf b/terraform/aws/scenarios/omnibus-external-openldap/main.tf
index b428a803327..3eaa08b63f1 100644
--- a/terraform/aws/scenarios/omnibus-external-openldap/main.tf
+++ b/terraform/aws/scenarios/omnibus-external-openldap/main.tf
@@ -1,5 +1,5 @@
 module "chef_server" {
-  source = "../../aws_instance"
+  source = "../../modules/aws_instance"
 
   aws_profile       = "${var.aws_profile}"
   aws_region        = "${var.aws_region}"
@@ -14,7 +14,7 @@ module "chef_server" {
 }
 
 module "ldap" {
-  source = "../../aws_instance"
+  source = "../../modules/aws_instance"
 
   aws_profile       = "${var.aws_profile}"
   aws_region        = "${var.aws_region}"
@@ -66,7 +66,7 @@ resource "null_resource" "ldap_cookbook" {
   depends_on = ["null_resource.ldap_config"]
 
   provisioner "local-exec" {
-    command = "chef-run --user ${module.ldap.ssh_username} ${module.ldap.public_ipv4_dns} ${path.module}/../../../dev/cookbooks/provisioning/recipes/ldap-server.rb"
+    command = "chef-run --user ${module.ldap.ssh_username} ${module.ldap.public_ipv4_dns} ${path.module}/../../../../dev/cookbooks/provisioning/recipes/ldap-server.rb"
   }
 }
 
diff --git a/terraform/aws/scenarios/omnibus-standalone-upgrade-from-stable/main.tf b/terraform/aws/scenarios/omnibus-standalone-upgrade-from-stable/main.tf
index 0666cd07081..77609595139 100644
--- a/terraform/aws/scenarios/omnibus-standalone-upgrade-from-stable/main.tf
+++ b/terraform/aws/scenarios/omnibus-standalone-upgrade-from-stable/main.tf
@@ -1,5 +1,5 @@
 module "chef_server" {
-  source = "../../aws_instance"
+  source = "../../modules/aws_instance"
 
   aws_profile       = "${var.aws_profile}"
   aws_region        = "${var.aws_region}"
diff --git a/terraform/aws/scenarios/omnibus-tiered-fresh-install/main.tf b/terraform/aws/scenarios/omnibus-tiered-fresh-install/main.tf
index f64db37ca67..33618b365fb 100644
--- a/terraform/aws/scenarios/omnibus-tiered-fresh-install/main.tf
+++ b/terraform/aws/scenarios/omnibus-tiered-fresh-install/main.tf
@@ -1,5 +1,5 @@
 module "back_end" {
-  source = "../../aws_instance"
+  source = "../../modules/aws_instance"
 
   aws_profile       = "${var.aws_profile}"
   aws_region        = "${var.aws_region}"
@@ -14,7 +14,7 @@ module "back_end" {
 }
 
 module "front_end" {
-  source = "../../aws_instance"
+  source = "../../modules/aws_instance"
 
   aws_profile       = "${var.aws_profile}"
   aws_region        = "${var.aws_region}"