diff --git a/environments/gprd/main.tf b/environments/gprd/main.tf index 381351a9b04c443c34da4c5454518e97435b3bde..3d390aa26b7b964068096d0e5dad2970636b706b 100644 --- a/environments/gprd/main.tf +++ b/environments/gprd/main.tf @@ -548,6 +548,31 @@ module "prometheus" { oauth2_client_secret = "${var.oauth2_client_secret_prometheus}" } +################################## +# +# Deploy +# +################################## + +module "deploy" { + attach_data_disk = false + bootstrap_version = 3 + chef_provision = "${var.chef_provision}" + chef_run_list = "\"role[${var.environment}-base-deploy-node]\"" + dns_zone_name = "${var.dns_zone_name}" + environment = "${var.environment}" + ip_cidr_range = "${var.subnetworks["deploy"]}" + machine_type = "${var.machine_types["deploy"]}" + name = "deploy" + node_count = "${var.node_count["deploy"]}" + project = "${var.project}" + public_ports = "${var.public_ports["deploy"]}" + region = "${var.region}" + source = "../../modules/google/generic-pet" + tier = "sv" + vpc = "${module.network.self_link}" +} + ################################## # # VPN connection to Azure diff --git a/environments/gprd/variables.tf b/environments/gprd/variables.tf index a500d9afa22ada0b04db9fc59ca57a25ea782acd..9a81d3ce9a4b530d16ec18a03f9109a245afba50 100644 --- a/environments/gprd/variables.tf +++ b/environments/gprd/variables.tf @@ -31,6 +31,7 @@ variable "public_ports" { default = { "api" = [22] "consul" = [22] + "deploy" = [22] "db" = [22] "pgb" = [22] "fe-lb" = [22, 80, 443, 2222] @@ -83,6 +84,7 @@ variable "machine_types" { default = { "api" = "n1-standard-8" "consul" = "n1-standard-4" + "deploy" = "n1-standard-2" "db" = "n1-highmem-32" "fe-lb" = "n1-standard-4" "geodb" = "n1-highmem-32" @@ -102,6 +104,7 @@ variable "node_count" { default = { "api" = 1 + "deploy" = 1 "artifacts" = 1 "consul" = 3 "db" = 1 @@ -125,6 +128,7 @@ variable "subnetworks" { default = { "api" = "10.220.2.0/23" + "deploy" = "10.218.3.0/24" "consul" = "10.218.1.0/24" "db" = "10.217.1.0/24" "fe-lb" = "10.216.1.0/24"