Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating from upstream #1

Merged
merged 29 commits into from
Feb 28, 2019
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1e80106
Fix for the error: module.vpc.aws_redshift_subnet_group.redshift: onl…
Oct 16, 2018
7c29b24
Merge pull request #181 from Miyurz/fix/redshift-name-issue
antonbabenko Dec 11, 2018
57604d2
Updated pre-commit version with new terraform-docs script
antonbabenko Dec 11, 2018
81895e7
Added IGW route for DB subnets (based on #179)
antonbabenko Dec 12, 2018
14b4237
Reverted complete-example
antonbabenko Dec 12, 2018
44bb589
Merge pull request #191 from terraform-aws-modules/feature-db-igw-pub…
antonbabenko Dec 12, 2018
4e484aa
Added azs to outputs which is an argument
antonbabenko Dec 27, 2018
8a293e7
Added possibility to control creation of elasticache and redshift sub…
antonbabenko Jan 10, 2019
c9bfc7e
Merge pull request #199 from terraform-aws-modules/elasticache_subnet…
antonbabenko Jan 10, 2019
ce5212f
Added SSM and EC2 VPC endpoints (fixes #195, #194)
antonbabenko Jan 17, 2019
296a992
Merge pull request #202 from terraform-aws-modules/ssm_and_ec2_vpc_en…
antonbabenko Jan 17, 2019
0160116
adding option to create a route to nat gateway in database subnets
ebarault Jan 11, 2019
2d5627d
Merge pull request #201 from ebarault/feat/database-route-to-natgw
antonbabenko Jan 18, 2019
8e2f50e
Reordered vars in count for database_nat_gateway route
antonbabenko Jan 18, 2019
ef0d14c
Merge pull request #1 from terraform-aws-modules/master
tbugfinder Jan 22, 2019
c1c3736
add endpoints ec2messages, ssmmessages as those are required by Syste…
tbugfinder Jan 22, 2019
f96e59c
fix typo
tbugfinder Jan 22, 2019
92596fa
add additional endpoints to examples
tbugfinder Feb 1, 2019
d001144
add files updated by pre-commit
tbugfinder Feb 1, 2019
3caad32
switch to terraform-docs v0.6.0
tbugfinder Feb 1, 2019
33e8809
Added option to create ECR api and dkr endpoints
Feb 12, 2019
176a596
Added subnet ids to ecr endpoints
Feb 12, 2019
a4a412e
Merge pull request #205 from tbugfinder/extend_endpoints
antonbabenko Feb 14, 2019
bd089fb
Fixed formatting after #205
antonbabenko Feb 14, 2019
8fededb
Merge pull request #213 from michieldhadamus/ecr-endpoints
antonbabenko Feb 14, 2019
03eded6
Fixed formatting after #213
antonbabenko Feb 14, 2019
b65963e
Added intra subnet suffix. (#220)
kmcquade Feb 21, 2019
b12e916
Added CHANGELOG.md (#221)
antonbabenko Feb 21, 2019
ad7164b
Bump version
antonbabenko Feb 21, 2019
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
Added intra subnet suffix. (terraform-aws-modules#220)
* Added intra subnet suffix.

* Fixed duplicate intra

* Fixed tag
  • Loading branch information
kmcquade authored and antonbabenko committed Feb 21, 2019
commit b65963edbd9981f686d522ea120d1e874c0fd6f0
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@ resource "aws_route_table" "intra" {

vpc_id = "${local.vpc_id}"

tags = "${merge(map("Name", "${var.name}-intra"), var.tags, var.intra_route_table_tags)}"
tags = "${merge(map("Name", "${var.name}-${var.intra_subnet_suffix}"), var.tags, var.intra_route_table_tags)}"
}

################
@@ -281,7 +281,7 @@ resource "aws_subnet" "intra" {
cidr_block = "${var.intra_subnets[count.index]}"
availability_zone = "${element(var.azs, count.index)}"

tags = "${merge(map("Name", format("%s-intra-%s", var.name, element(var.azs, count.index))), var.tags, var.intra_subnet_tags)}"
tags = "${merge(map("Name", format("%s-${var.intra_subnet_suffix}-%s", var.name, element(var.azs, count.index))), var.tags, var.intra_subnet_tags)}"
}

##############
5 changes: 5 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -38,6 +38,11 @@ variable "private_subnet_suffix" {
default = "private"
}

variable "intra_subnet_suffix" {
description = "Suffix to append to intra subnets name"
default = "intra"
}

variable "database_subnet_suffix" {
description = "Suffix to append to database subnets name"
default = "db"