Commit 24b91b74 authored by John Jarvis's avatar John Jarvis

Adds web cny node.

parent b1481d5e
......@@ -305,6 +305,7 @@ variable "node_count" {
"stor" = 20
"multizone-stor" = 4
"web" = 14
"web-cny" = 1
"alerts" = 2
"prometheus" = 2
"prometheus-app" = 2
......
......@@ -304,6 +304,7 @@ variable "node_count" {
"stor" = 2
"multizone-stor" = 0
"web" = 1
"web-cny" = 1
"prometheus" = 2
"prometheus-app" = 2
"alerts" = 2
......
......@@ -82,6 +82,37 @@ module "web" {
vpc = "${module.network.self_link}"
}
##################################
#
# Web Canary front-end
#
#################################
module "web-cny" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-fe-web-cny]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["web"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["web"]}"
name = "web-cny"
node_count = "${var.node_count["web-cny"]}"
os_disk_type = "pd-ssd"
project = "${var.project}"
public_ports = "${var.public_ports["web"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "../../modules/google/generic-sv-with-group"
subnetwork_name = "${module.web.google_compute_subnetwork_name}"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# API
......@@ -286,26 +317,26 @@ module "geo-postgres" {
module "redis" {
allow_stopping_for_update = true
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-redis-server-single]\""
data_disk_size = 52
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-stor"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-redis-server-single]\""
data_disk_size = 52
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-stor"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "redis-cache" {
......
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