Commit 6640a9e9 authored by John Jarvis's avatar John Jarvis

Adds VM for dev in ops

parent bab3d831
......@@ -508,6 +508,62 @@ module "dashboards-com" {
vpc = "${module.network.self_link}"
}
#######################################################
#
# VM for dev-replacement.gitlab.net
# This is the eventual replacement of dev.gitlab.org,
# we aren't calling this dev.gitlab.net to avoid confusion
# until we switch over.
#
#######################################################
resource "aws_route53_record" "gitlab-dev" {
zone_id = "${var.gitlab_net_zone_id}"
name = "dev-replacement.gitlab.net"
type = "A"
ttl = "300"
records = ["${module.gitlab-dev.instance_public_ips[0]}"]
}
resource "aws_route53_record" "dev-registry" {
zone_id = "${var.gitlab_net_zone_id}"
name = "registry.dev-replacement.gitlab.net"
type = "A"
ttl = "300"
records = ["${module.gitlab-dev.instance_public_ips[0]}"]
}
module "gitlab-dev" {
backend_protocol = "HTTPS"
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-gitlab-dev]\""
data_disk_size = 500
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "http"
health_check_port = 8887
ip_cidr_range = "${var.subnetworks["gitlab-dev"]}"
machine_type = "${var.machine_types["gitlab-dev"]}"
name = "gitlab-dev"
node_count = 1
oauth2_client_id = "${var.oauth2_client_id_gitlab_ops}"
oauth2_client_secret = "${var.oauth2_client_secret_gitlab_ops}"
persistent_disk_path = "/var/opt/gitlab"
project = "${var.project}"
public_ports = "${var.public_ports["gitlab-dev"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
tier = "inf"
use_external_ip = true
use_new_node_name = true
vpc = "${module.network.self_link}"
}
#######################################################
#
# VM for ops.gitlab.net
......
......@@ -45,6 +45,7 @@ variable "machine_types" {
"dashboards-com" = "n1-standard-4"
"monitor" = "n1-standard-8"
"monitoring" = "n1-standard-2"
"gitlab-dev" = "n1-standard-8"
"gitlab-ops" = "n1-standard-16"
"runner-build" = "n1-standard-32"
"runner-chatops" = "n1-standard-8"
......@@ -104,6 +105,7 @@ variable "subnetworks" {
"thanos-store" = "10.250.18.0/24"
"thanos-compact" = "10.250.19.0/24"
"aptly" = "10.250.20.0/24"
"gitlab-dev" = "10.250.21.0/24"
}
}
......@@ -115,6 +117,7 @@ variable "public_ports" {
"proxy" = []
"bastion" = [22]
"dashboards" = []
"gitlab-dev" = [443, 80, 22, 5005]
"gitlab-ops" = [443, 80, 22, 5005]
"pubsubbeat" = []
"runner" = []
......@@ -135,6 +138,7 @@ variable "node_count" {
"bastion" = 1
"blackbox" = 1
"dashboards" = 1
"gitlab-dev" = 1
"gitlab-ops" = 1
"nessus" = 1
"prometheus" = 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