Unverified Commit 64b4b977 authored by Alex Hanselka's avatar Alex Hanselka
Browse files

add mailroom nodes to gprd

parent a9e3c59c
...@@ -279,6 +279,30 @@ module "sidekiq" { ...@@ -279,6 +279,30 @@ module "sidekiq" {
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
} }
##################################
#
# mailroom
#
##################################
module "mailroom" {
bootstrap_version = 3
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-fe-git]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["mailroom"]}"
machine_type = "${var.machine_types["mailroom"]}"
name = "mailroom"
node_count = "${var.node_count["mailroom"]}"
project = "${var.project}"
public_ports = "${var.public_ports["mailroom"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv"
tier = "sv"
vpc = "${module.network.self_link}"
}
################################## ##################################
# #
# Storage nodes for repositories # Storage nodes for repositories
......
...@@ -38,6 +38,7 @@ variable "public_ports" { ...@@ -38,6 +38,7 @@ variable "public_ports" {
"fe-lb" = [22, 80, 443, 2222] "fe-lb" = [22, 80, 443, 2222]
"geodb" = [22] "geodb" = [22]
"git" = [22] "git" = [22]
"mailroom" = [22]
"redis" = [22] "redis" = [22]
"redis-cache" = [22] "redis-cache" = [22]
"sidekiq" = [22] "sidekiq" = [22]
...@@ -92,6 +93,7 @@ variable "machine_types" { ...@@ -92,6 +93,7 @@ variable "machine_types" {
"geodb" = "n1-highmem-32" "geodb" = "n1-highmem-32"
"git" = "n1-standard-16" "git" = "n1-standard-16"
"pgb" = "n1-standard-4" "pgb" = "n1-standard-4"
"mailroom" = "n1-standard-4"
"monitoring" = "n1-standard-8" "monitoring" = "n1-standard-8"
"redis" = "n1-highmem-2" "redis" = "n1-highmem-2"
"redis-cache" = "n1-highmem-16" "redis-cache" = "n1-highmem-16"
...@@ -115,6 +117,7 @@ variable "node_count" { ...@@ -115,6 +117,7 @@ variable "node_count" {
"geodb" = 1 "geodb" = 1
"git" = 1 "git" = 1
"lfs" = 1 "lfs" = 1
"mailroom" = 1
"pages" = 1 "pages" = 1
"pgb" = 1 "pgb" = 1
"redis" = 1 "redis" = 1
...@@ -139,6 +142,7 @@ variable "subnetworks" { ...@@ -139,6 +142,7 @@ variable "subnetworks" {
"geodb" = "10.217.6.0/24" "geodb" = "10.217.6.0/24"
"monitoring" = "10.219.1.0/24" "monitoring" = "10.219.1.0/24"
"git" = "10.220.4.0/23" "git" = "10.220.4.0/23"
"mailroom" = "10.220.14.0/23"
"pgb" = "10.217.4.0/24" "pgb" = "10.217.4.0/24"
"redis" = "10.217.2.0/24" "redis" = "10.217.2.0/24"
"redis-cache" = "10.217.5.0/24" "redis-cache" = "10.217.5.0/24"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment