modify how the module handles Ansible vault password files.

ajcarberry · Aug 3, 2019 · dd3be2a · dd3be2a
1 parent 6dd2131
commit dd3be2a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/aws/ec2/debian/input.tf b/aws/ec2/debian/input.tf
@@ -2,13 +2,14 @@
 # Required variables
 # =================================
 
-variable "vpc"              {}
-variable "vpc_name"         {}
-variable "env"              {}
-variable "subnet_id"        {}
-variable "public_ip"        {}
-variable "instance_type"    {}
-variable "name"             {}
-variable "security_groups"  {type = "list"}
-variable "playbook"         {default = ""}
-variable "destroy"          {default = ""}
+variable "vpc"                {}
+variable "vpc_name"           {}
+variable "env"                {}
+variable "subnet_id"          {}
+variable "public_ip"          {}
+variable "instance_type"      {}
+variable "name"               {}
+variable "security_groups"    {type = "list"}
+variable "playbook"           {default = ""}
+variable "destroy"            {default = ""}
+variable "vault_passwd_file"  {default = ".vault_pass.txt"}
diff --git a/aws/ec2/debian/main.tf b/aws/ec2/debian/main.tf
@@ -35,10 +35,10 @@ resource "aws_instance" "debian_ec2" {
   }
 
 	provisioner "local-exec" {
-    command = "${var.playbook == "" ? "sleep 60" : "sleep 90; ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.playbook} --extra-vars 'env=${var.env}' --vault-password-file ../../ansible/vault_pass.txt"}"
+    command = "${var.playbook == "" ? "sleep 60" : "sleep 90; ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.playbook} --extra-vars 'env=${var.env}' --vault-password-file ${var.vault_passwd_file}"}"
   }
 	provisioner "local-exec" {
-		command = "${var.destroy == "" ? "sleep 10" : "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.destroy} --extra-vars 'env=${var.env}' --vault-password-file ../../ansible/vault_pass.txt"}"
+		command = "${var.destroy == "" ? "sleep 10" : "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.destroy} --extra-vars 'env=${var.env}' --vault-password-file ${var.vault_passwd_file}"}"
 		when = "destroy"
 	}
 

diff --git a/aws/ec2/ubuntu/input.tf b/aws/ec2/ubuntu/input.tf
@@ -13,3 +13,4 @@ variable "instance_count"   {}
 variable "security_groups"  {type = "list"}
 variable "playbook"         {default = ""}
 variable "destroy"          {default = ""}
+variable "vault_passwd_file"  {default = ".vault_pass.txt"}
diff --git a/aws/ec2/ubuntu/main.tf b/aws/ec2/ubuntu/main.tf
@@ -46,10 +46,10 @@ resource "aws_instance" "ubuntu_ec2" {
   }
 
   provisioner "local-exec" {
-    command = "${var.playbook == "" ? "sleep 60" : "sleep 90; ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.playbook} --extra-vars 'env=${var.env}' --vault-password-file ../../ansible/vault_pass.txt"}"
+    command = "${var.playbook == "" ? "sleep 60" : "sleep 90; ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.playbook} --extra-vars 'env=${var.env}' --vault-password-file ${var.vault_passwd_file}"}"
   }
 	provisioner "local-exec" {
-		command = "${var.destroy == "" ? "sleep 10" : "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.destroy} --extra-vars 'env=${var.env}' --vault-password-file ../../ansible/vault_pass.txt"}"
+		command = "${var.destroy == "" ? "sleep 10" : "ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${self.public_ip}, ${var.destroy} --extra-vars 'env=${var.env}' --vault-password-file ${var.vault_passwd_file}"}"
 		when = "destroy"
 	}