Commit 36cdfc8e authored by Ahmad Sherif's avatar Ahmad Sherif
Browse files

Merge branch 'jarv/add-ops-runner' into 'master'

Add ops runner.

See merge request !467
parents 0de9d054 03f41bf6
......@@ -258,6 +258,35 @@ module "bastion" {
vpc = "${module.network.self_link}"
}
##################################
#
# Runner
#
##################################
module "runner" {
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-runner]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["runner"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["runner"]}"
name = "runner"
node_count = "${var.node_count["runner"]}"
project = "${var.project}"
public_ports = "${var.public_ports["runner"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "../../modules/google/generic-sv-with-group"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# Google storage buckets
......
......@@ -31,6 +31,7 @@ variable "machine_types" {
"dashboards" = "n1-standard-4"
"monitor" = "n1-standard-8"
"gitlab-ops" = "n1-standard-16"
"runner" = "n1-standard-2"
}
}
......@@ -53,6 +54,7 @@ variable "subnetworks" {
"gitlab-ops" = "10.250.4.0/24"
"proxy" = "10.250.5.0/24"
"monitor" = "10.250.6.0/24"
"runner" = "10.250.7.0/24"
}
}
......@@ -65,6 +67,7 @@ variable "public_ports" {
"bastion" = [22]
"dashboards" = []
"gitlab-ops" = [443, 80, 22, 5005]
"runner" = []
}
}
......@@ -75,6 +78,7 @@ variable "node_count" {
"bastion" = 1
"dashboards" = 1
"gitlab-ops" = 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