Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Facilitate specifying non-default VPC (shamelessly ripped off from hashicorp/terraform-aws-consul) #26

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Facilitate specifying non-default VPC (shamelessly ripped off from hashicorp/terraform-aws-consul) #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3323a71
Add ability to specify VPC.
boldandbusted Nov 27, 2017
93339ed
Add non-default VPC support to vault-cluster-private example.
boldandbusted Nov 27, 2017
6eee689
Merge to preserve S3 persistent storage capability, hopefully.
boldandbusted Apr 12, 2018
c624968
Create IAM Instance Profile Role policy to allow Vault AWS Auth full …
boldandbusted Apr 12, 2018
e349cbf
Merge pull request #1 from boldandbusted/Add_reccomended_Vault_IAM_Po…
boldandbusted Apr 12, 2018
03d8194
Remove duplicate vpc_id variable; set default to false for new enable…
boldandbusted Apr 13, 2018
7257e89
Merge pull request #2 from boldandbusted/Add_reccomended_Vault_IAM_Po…
boldandbusted Apr 13, 2018
3eef292
Expose more variables from underlying modules.
boldandbusted Apr 13, 2018
209b96b
Merge pull request #3 from boldandbusted/Add_reccomended_Vault_IAM_Po…
boldandbusted Apr 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge to preserve S3 persistent storage capability, hopefully.
  • Loading branch information
@boldandbusted
boldandbusted committed Apr 12, 2018
commit 6eee689f0bd0f4b58840a43ab4bf785fe2e9c36c
2 changes: 1 addition & 1 deletion examples/vault-cluster-private/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ data "template_file" "user_data_consul" {

data "aws_vpc" "default" {
default = "${var.vpc_id == "" ? true : false}"
id = "${var.vpc_id}"
id = "${var.vpc_id}"
}

data "aws_subnet_ids" "default" {
Expand Down
1 change: 1 addition & 0 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ data "template_file" "user_data_consul" {
data "aws_vpc" "default" {
default = "${var.vpc_id == "" ? true : false}"
id = "${var.vpc_id}"
tags = "${var.vpc_tags}"
}

data "aws_subnet_ids" "default" {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.