Commit f1acda05 authored by John Jarvis's avatar John Jarvis

Add the deploy node

parent f4e1fc70
......@@ -409,6 +409,37 @@ module "gcp-tcp-lb-registry" {
targets = ["fe-registry"]
}
##################################
#
# Deploy
#
##################################
module "deploy" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-deploy-node]\""
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.deploy_egress_ports}"
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["deploy"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy"
node_count = "${var.node_count["deploy"]}"
project = "${var.project}"
public_ports = "${var.public_ports["deploy"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
tier = "sv"
use_external_ip = true
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# registry front-end
......
......@@ -65,6 +65,7 @@ variable "machine_types" {
"web-pages" = "n1-standard-1"
"fe-lb" = "n1-standard-1"
"gitaly" = "n1-standard-1"
"deploy" = "n1-standard-1"
}
}
......@@ -136,6 +137,7 @@ variable "subnetworks" {
"sidekiq" = "10.232.16.0/24"
"web-pages" = "10.232.17.0/24"
"gitaly" = "10.232.18.0/24"
"deploy" = "10.232.19.0/24"
# /mnt/storage
"filestore-storage" = "10.237.0.0/29"
......@@ -181,6 +183,7 @@ variable "public_ports" {
"web-pages" = []
"fe-lb" = [22, 80, 443]
"gitaly" = []
"deploy" = []
}
}
......@@ -203,6 +206,7 @@ variable "node_count" {
"fe-lb-pages" = 1
"fe-lb-registry" = 1
"gitaly" = 1
"deploy" = 1
}
}
......@@ -320,3 +324,8 @@ variable "egress_ports" {
type = "list"
default = ["80", "443"]
}
variable "deploy_egress_ports" {
type = "list"
default = ["80", "443", "22"]
}
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