Commit 19a3da88 authored by John Jarvis's avatar John Jarvis

Merge branch 'jarv/add-deploy-canary' into 'master'

Add deploy canary VM

See merge request !811
parents 1be7c958 9fe28474
......@@ -378,6 +378,7 @@ variable "node_count" {
"consul" = 5
"db-dr" = 2
"deploy" = 1
"deploy-cny" = 1
"fe-lb" = 16
"fe-lb-altssh" = 2
"fe-lb-pages" = 2
......@@ -444,6 +445,7 @@ variable "subnetworks" {
"deploy" = "10.218.3.0/24"
"runner" = "10.218.4.0/24"
"console" = "10.218.5.0/24"
"deploy-cny" = "10.218.7.0/24"
"monitoring" = "10.219.1.0/24"
"pubsubbeat" = "10.219.2.0/24"
"registry" = "10.220.10.0/23"
......
......@@ -370,6 +370,7 @@ variable "node_count" {
"console" = 1
"contributors" = 1
"deploy" = 1
"deploy-cny" = 0
"runner" = 1
"consul" = 5
"db-dr" = 2
......@@ -428,6 +429,7 @@ variable "subnetworks" {
"db-dr-delayed" = "10.224.24.0/24"
"db-dr-archive" = "10.224.25.0/24"
"deploy" = "10.224.15.0/24"
"deploy-cny" = "10.224.17.0/24" # This is a placeholder, as there is not currently a deploy canary
"fe-lb" = "10.224.14.0/24"
"fe-lb-altssh" = "10.224.19.0/24"
"fe-lb-pages" = "10.224.18.0/24"
......
......@@ -120,6 +120,36 @@ module "web" {
vpc = "${module.network.self_link}"
}
##################################
#
# Deploy Canary
#
##################################
module "deploy-cny" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-deploy-node-cny]\""
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-cny"]}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy-cny"
node_count = "${var.node_count["deploy-cny"]}"
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.4"
tier = "sv"
use_external_ip = true
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# Web Canary front-end
......
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