Added custom name support to KMS

This allows you to use the custom naming for the IAM Role in the KMS module.
Capgemini · Jul 22, 2017 · 57e02bf · 57e02bf
1 parent 21a2827
commit 57e02bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -88,6 +88,7 @@ module "s3" {
   name         = "${var.cluster-name}"
   bucketname   = "${var.bucketname}"
   worker-role  = "${var.worker_role_name}"
+  master-role  = "${var.master_role_name}"
   capem        = "${var.capem}"
   cakey        = "${var.cakey}"
   etcdpem      = "${var.etcdpem}"

diff --git a/modules/s3/01-arngen.tf b/modules/s3/01-arngen.tf
@@ -5,8 +5,8 @@ data "template_file" "kmspolicy" {
   template   = "${file("${path.module}/Files/kmspolicy.json.tpl")}"
 
   vars {
-    arn       = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/worker_role"
-    masterarn = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/master_role"
+    arn       = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/${var.worker-role}"
+    masterarn = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/${var.master-role}"
     rootarn   = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"
   }
 }
diff --git a/modules/s3/variables.tf b/modules/s3/variables.tf
@@ -6,6 +6,8 @@ variable "bucketname" {}
 
 variable "worker-role" {}
 
+variable "master-role" {}
+
 ### Bucket objects
 
 variable "capem" {}