subnets are called infrastructure instead of management

[#159643028]

Signed-off-by: Josh Zarrabi <jzarrabi@pivotal.io>

modules.tf

@@ -3,7 +3,7 @@ module "ops_manager" {
 
   count          = "${var.ops_manager ? 1 : 0}"
   optional_count = "${var.optional_ops_manager ? 1 : 0}"
-  subnet_id      = "${var.ops_manager_private ? aws_subnet.management_subnets.0.id : aws_subnet.public_subnets.0.id}"
+  subnet_id      = "${var.ops_manager_private ? aws_subnet.infrastructure_subnets.0.id : aws_subnet.public_subnets.0.id}"
 
   env_name                  = "${var.env_name}"
   ami                       = "${var.ops_manager_ami}"

outputs.tf

@@ -131,24 +131,24 @@ output "public_subnet_cidrs" {
   value = ["${aws_subnet.public_subnets.*.cidr_block}"]
 }
 
-output "management_subnet_ids" {
-  value = ["${aws_subnet.management_subnets.*.id}"]
+output "infrastructure_subnet_ids" {
+  value = ["${aws_subnet.infrastructure_subnets.*.id}"]
 }
 
-output "management_subnets" {
-  value = ["${aws_subnet.management_subnets.*.id}"]
+output "infrastructure_subnets" {
+  value = ["${aws_subnet.infrastructure_subnets.*.id}"]
 }
 
-output "management_subnet_availability_zones" {
-  value = ["${aws_subnet.management_subnets.*.availability_zone}"]
+output "infrastructure_subnet_availability_zones" {
+  value = ["${aws_subnet.infrastructure_subnets.*.availability_zone}"]
 }
 
-output "management_subnet_cidrs" {
-  value = ["${aws_subnet.management_subnets.*.cidr_block}"]
+output "infrastructure_subnet_cidrs" {
+  value = ["${aws_subnet.infrastructure_subnets.*.cidr_block}"]
 }
 
-output "management_subnet_gateways" {
-  value = ["${data.template_file.management_subnet_gateways.*.rendered}"]
+output "infrastructure_subnet_gateways" {
+  value = ["${data.template_file.infrastructure_subnet_gateways.*.rendered}"]
 }
 
 output "pas_subnet_ids" {

route_tables.tf

@@ -23,9 +23,9 @@ resource "aws_route_table" "private_route_table" {
   }
 }
 
-resource "aws_route_table_association" "route_management_subnets" {
+resource "aws_route_table_association" "route_infrastructure_subnets" {
   count          = "${length(var.availability_zones)}"
-  subnet_id      = "${element(aws_subnet.management_subnets.*.id, count.index)}"
+  subnet_id      = "${element(aws_subnet.infrastructure_subnets.*.id, count.index)}"
   route_table_id = "${element(aws_route_table.private_route_table.*.id, count.index)}"
 }
 

subnets.tf

@@ -1,9 +1,9 @@
 locals {
-  public_cidr     = "${cidrsubnet(var.vpc_cidr, 6, 0)}"
-  management_cidr = "${cidrsubnet(var.vpc_cidr, 10, 64)}"
-  pas_cidr        = "${cidrsubnet(var.vpc_cidr, 6, 1)}"
-  services_cidr   = "${cidrsubnet(var.vpc_cidr, 6, 2)}"
-  rds_cidr        = "${cidrsubnet(var.vpc_cidr, 6, 3)}"
+  public_cidr         = "${cidrsubnet(var.vpc_cidr, 6, 0)}"
+  infrastructure_cidr = "${cidrsubnet(var.vpc_cidr, 10, 64)}"
+  pas_cidr            = "${cidrsubnet(var.vpc_cidr, 6, 1)}"
+  services_cidr       = "${cidrsubnet(var.vpc_cidr, 6, 2)}"
+  rds_cidr            = "${cidrsubnet(var.vpc_cidr, 6, 3)}"
 }
 
 resource "aws_subnet" "public_subnets" {
@@ -17,24 +17,24 @@ resource "aws_subnet" "public_subnets" {
   )}"
 }
 
-resource "aws_subnet" "management_subnets" {
+resource "aws_subnet" "infrastructure_subnets" {
   count             = "${length(var.availability_zones)}"
   vpc_id            = "${aws_vpc.vpc.id}"
-  cidr_block        = "${cidrsubnet(local.management_cidr, 2, count.index)}"
+  cidr_block        = "${cidrsubnet(local.infrastructure_cidr, 2, count.index)}"
   availability_zone = "${element(var.availability_zones, count.index)}"
 
   tags = "${merge(var.tags, local.default_tags,
-    map("Name", "${var.env_name}-management-subnet${count.index}")
+    map("Name", "${var.env_name}-infrastructure-subnet${count.index}")
   )}"
 }
 
-data "template_file" "management_subnet_gateways" {
+data "template_file" "infrastructure_subnet_gateways" {
   # Render the template once for each availability zone
   count    = "${length(var.availability_zones)}"
   template = "$${gateway}"
 
   vars {
-    gateway = "${cidrhost(element(aws_subnet.management_subnets.*.cidr_block, count.index), 1)}"
+    gateway = "${cidrhost(element(aws_subnet.infrastructure_subnets.*.cidr_block, count.index), 1)}"
   }
 }
 

variables.tf

@@ -42,8 +42,8 @@ variable "ops_manager_instance_type" {
 }
 
 variable "ops_manager_private" {
-  default = false
-  description = "If true, the Ops Manager will be colocated with the BOSH director on the management subnet instead of on the public subnet"
+  default     = false
+  description = "If true, the Ops Manager will be colocated with the BOSH director on the infrastructure subnet instead of on the public subnet"
 }
 
 variable "rds_db_username" {