Commit 20121523 authored by John Jarvis's avatar John Jarvis Committed by Alex Hanselka

Add blackbox hosts in gprd and gstg.

parent f74d3aa5
......@@ -989,6 +989,28 @@ module "sd-exporter" {
additional_scopes = ["https://www.googleapis.com/auth/monitoring"]
}
module "blackbox" {
bootstrap_version = 5
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-blackbox]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
machine_type = "${var.machine_types["blackbox"]}"
name = "blackbox"
node_count = "${var.node_count["blackbox"]}"
project = "${var.project}"
public_ports = "${var.public_ports["blackbox"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "inf"
vpc = "${module.network.self_link}"
service_account_email = "${var.service_account_email}"
}
##################################
#
# Console
......
......@@ -147,6 +147,7 @@ variable "public_ports" {
default = {
"api" = []
"bastion" = [22]
"blackbox" = []
"consul" = []
"console" = []
"deploy" = []
......@@ -215,6 +216,7 @@ variable "machine_types" {
default = {
"api" = "n1-standard-8"
"bastion" = "g1-small"
"blackbox" = "n1-standard-1"
"consul" = "n1-standard-4"
"db" = "n1-highmem-32"
"console" = "n1-standard-1"
......@@ -251,6 +253,7 @@ variable "node_count" {
"api" = 14
"artifacts" = 1
"bastion" = 3
"blackbox" = 1
"console" = 1
"consul" = 3
"db" = 4
......
......@@ -969,6 +969,28 @@ module "sd-exporter" {
additional_scopes = ["https://www.googleapis.com/auth/monitoring"]
}
module "blackbox" {
bootstrap_version = 5
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-blackbox]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
machine_type = "${var.machine_types["blackbox"]}"
name = "blackbox"
node_count = "${var.node_count["blackbox"]}"
project = "${var.project}"
public_ports = "${var.public_ports["blackbox"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "inf"
vpc = "${module.network.self_link}"
service_account_email = "${var.service_account_email}"
}
##################################
#
# Console
......
......@@ -144,6 +144,7 @@ variable "public_ports" {
default = {
"api" = []
"bastion" = [22]
"blackbox" = []
"console" = []
"consul" = []
"deploy" = []
......@@ -212,6 +213,7 @@ variable "machine_types" {
default = {
"api" = "n1-standard-4"
"bastion" = "g1-small"
"blackbox" = "n1-standard-1"
"console" = "n1-standard-1"
"consul" = "n1-standard-4"
"deploy" = "n1-standard-2"
......@@ -248,6 +250,7 @@ variable "node_count" {
default = {
"api" = 1
"bastion" = 1
"blackbox" = 1
"console" = 1
"deploy" = 1
"runner" = 1
......
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