From 0b0ae99a63242364f6a6e8966fcb7cb0a0eb1427 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Mon, 22 Oct 2018 04:14:15 -0700
Subject: Export server id from trigger in module, for correct dependency
 ordering

---
 packages/vm/customize.sh | 2 +-
 terraform/main.tf        | 2 +-
 terraform/volume/main.tf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 terraform/main.tf

diff --git a/packages/vm/customize.sh b/packages/vm/customize.sh
index d4b2478..e8f67b6 100755
--- a/packages/vm/customize.sh
+++ b/packages/vm/customize.sh
@@ -7,7 +7,7 @@ abort() {
 
 rootdir="$1"
 
-# avoid messing with host system
+# avoid messing with host system, in case this script is run by accident
 [[ -n $rootdir ]] || abort "root directory is not set"
 
 # set up local apt archive
diff --git a/terraform/main.tf b/terraform/main.tf
old mode 100644
new mode 100755
index 8a5e599..54ed333
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -44,7 +44,7 @@ module "roles" {
   source                  = "./role"
   secret_cloudflare_token = "${var.secret_cloudflare_token}"
   host                    = "${module.vps.fqdn}"
-  id                      = "${module.volume.server_id}"
+  id                      = "${module.vps.id}"
   roles                   = ["ip", "git"]
 }
 
diff --git a/terraform/volume/main.tf b/terraform/volume/main.tf
index 828d85d..7f4a8b6 100644
--- a/terraform/volume/main.tf
+++ b/terraform/volume/main.tf
@@ -64,5 +64,5 @@ EOF
 }
 
 output "server_id" {
-  value = "${var.server_id}"
+  value = "${null_resource.volume_mount.triggers.server_id}"
 }
-- 
cgit v1.2.3