Merge pull request #32 from tamentis/master

Make vpc_id an input parameter as well.
hashicorp · Aug 27, 2018 · fa6197c · fa6197c
2 parents 651ee4e + 60401f2
commit fa6197c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -198,11 +198,12 @@ data "template_file" "user_data_client" {
 # ---------------------------------------------------------------------------------------------------------------------
 
 data "aws_vpc" "default" {
-  default = true
+  default = "${var.vpc_id == "" ? true : false}"
+  id      = "${var.vpc_id}"
 }
 
 data "aws_subnet_ids" "default" {
   vpc_id = "${data.aws_vpc.default.id}"
 }
 
-data "aws_region" "current" {}
+data "aws_region" "current" {}
diff --git a/variables.tf b/variables.tf
@@ -58,3 +58,8 @@ variable "ssh_key_name" {
   description = "The name of an EC2 Key Pair that can be used to SSH to the EC2 Instances in this cluster. Set to an empty string to not associate a Key Pair."
   default     = ""
 }
+
+variable "vpc_id" {
+  description = "The ID of the VPC in which the nodes will be deployed.  Uses default VPC if not supplied."
+  default     = ""
+}