combine uploads,builds,cache to one share server

parent 33642f43
......@@ -275,8 +275,7 @@ module "sidekiq" {
module "file" {
attach_data_disk = true
// data_disk_size = 16000
data_disk_size = 1000
data_disk_size = 16000
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
......@@ -302,7 +301,7 @@ module "file" {
#
##################################
module "uploads" {
module "share" {
attach_data_disk = true
data_disk_size = 16000
......@@ -311,10 +310,10 @@ module "uploads" {
chef_run_list = "${var.base_chef_run_list}"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["uploads"]}"
ip_cidr_range = "${var.subnetworks["share"]}"
machine_type = "${var.machine_types["stor"]}"
name = "uploads"
node_count = "${var.node_count["uploads"]}"
name = "share"
node_count = "${var.node_count["share"]}"
project = "${var.project}"
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
......@@ -386,48 +385,6 @@ module "artifacts" {
vpc = "${module.network.self_link}"
}
module "builds" {
attach_data_disk = true
data_disk_size = 16000
data_disk_type = "pd-standard"
chef_provision = "${var.chef_provision}"
chef_run_list = "${var.base_chef_run_list}"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["builds"]}"
machine_type = "${var.machine_types["stor"]}"
name = "builds"
node_count = "${var.node_count["builds"]}"
project = "${var.project}"
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
source = "../../modules/google/generic-pet"
tier = "stor"
vpc = "${module.network.self_link}"
}
module "cache" {
attach_data_disk = true
data_disk_size = 16000
data_disk_type = "pd-standard"
chef_provision = "${var.chef_provision}"
chef_run_list = "${var.base_chef_run_list}"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["cache"]}"
machine_type = "${var.machine_types["stor"]}"
name = "cache"
node_count = "${var.node_count["cache"]}"
project = "${var.project}"
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
source = "../../modules/google/generic-pet"
tier = "stor"
vpc = "${module.network.self_link}"
}
##################################
#
# External LoadBalancer
......
......@@ -85,12 +85,10 @@ variable "node_count" {
"sidekiq-besteffort" = 1
"stor" = 1
"web" = 1
"uploads" = 1
"lfs" = 1
"pages" = 1
"artifacts" = 1
"builds" = 1
"cache" = 1
"share" = 1
}
}
......@@ -114,12 +112,10 @@ variable "subnetworks" {
# These will eventually (tm) be
# moved to object storage
"uploads" = "10.221.4.0/27" # 10.221.4.0 - 10.221.4.31
"lfs" = "10.221.4.32/27" # 10.221.4.32 - 10.221.4.63
"pages" = "10.221.4.64/27" # 10.221.4.64 - 10.221.4.95
"artifacts" = "10.221.4.96/27" # 10.221.4.96 - 10.221.4.127
"builds" = "10.221.4.128/27" # 10.221.4.128 - 10.221.4.159
"cache" = "10.221.4.160/27" # 10.221.4.160 - 10.221.4.191
"share" = "10.221.4.0/27" # 10.221.4.0 - 10.221.4.31
"lfs" = "10.221.4.32/27" # 10.221.4.32 - 10.221.4.63
"pages" = "10.221.4.64/27" # 10.221.4.64 - 10.221.4.95
"artifacts" = "10.221.4.96/27" # 10.221.4.96 - 10.221.4.127
#############################
}
......
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