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

feat: yel-8015 Modified to reduce the CIDR range for haproxy #199

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions ops.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ module "ops" {
}

naming_suffix = local.naming_suffix
cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.0/16"
vpc_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.0/24"
public_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.2.0/24"
ad_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.4.0/24"
tableau_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.6.0/24"
cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.0/24"
vpc_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.0/27"
public_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.2.0/27"
ad_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.4.0/27"
tableau_subnet_cidr_block = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.6.0/27"
az = "eu-west-2a"
bastion_linux_ip = "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.11"
bastions_windows_ip = ["${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.12", "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.13", "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.14", "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.15", "${var.NAMESPACE == "prod" ? "10.2" : "10.8"}.0.16"]
Expand Down
4 changes: 2 additions & 2 deletions peering.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module "peering" {
}

cidr_block = "10.3.0.0/16"
haproxy_subnet_cidr_block = "10.3.0.0/24"
public_subnet_cidr_block = "10.3.3.0/24"
haproxy_subnet_cidr_block = "10.3.0.0/27"
public_subnet_cidr_block = "10.3.3.0/27"
haproxy_private_ip = "10.3.0.11"
haproxy_private_ip2 = "10.3.0.12"
s3_bucket_name = "s3-dq-peering-haproxy-config-bucket-${var.NAMESPACE}"
Expand Down