Commit 5bda76fc authored by Hendrik Meyer's avatar Hendrik Meyer
Browse files

Merge branch 'blackbox-inf-ops' into 'master'

add blackbox-01-inf-ops

See merge request !679
parents 9fcfee77 ef0e807f
......@@ -272,6 +272,30 @@ module "sd-exporter" {
vpc = "${module.network.self_link}"
}
module "blackbox" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-blackbox]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
kernel_version = "${var.default_kernel_version}"
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}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
use_external_ip = true
}
#######################################################
#
# Load balancer and VM for dashboards.gitlab.net
......
......@@ -14,6 +14,10 @@ variable "dns_zone_name" {
default = "gitlab.net"
}
variable "default_kernel_version" {
default = "4.15.0-1015"
}
variable "oauth2_client_id_log_proxy" {}
variable "oauth2_client_secret_log_proxy" {}
variable "oauth2_client_id_dashboards" {}
......
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