Commit 72230427 authored by John Skarbek's avatar John Skarbek

Merge branch 'pre-consul' into 'master'

Add consul module to pre environment

See merge request !776
parents 093a7250 9c879bd2
......@@ -214,6 +214,34 @@ module "bastion" {
vpc = "${module.network.self_link}"
}
##################################
#
# Consul
#
##################################
module "consul" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-consul]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["consul"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["consul"]}"
name = "consul"
node_count = "${var.node_count["consul"]}"
project = "${var.project}"
public_ports = "${var.public_ports["consul"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 8300
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# Google storage buckets
......
......@@ -67,6 +67,7 @@ variable "machine_types" {
"fe-lb" = "n1-standard-1"
"gitaly" = "n1-standard-1"
"deploy" = "n1-standard-1"
"consul" = "n1-standard-1"
}
}
......@@ -141,6 +142,7 @@ variable "subnetworks" {
"deploy" = "10.232.19.0/24"
"gke-pre" = "10.232.20.0/24"
"web-puma" = "10.232.21.0/24"
"consul" = "10.232.22.0/24"
"gke-pre-pod-cidr" = "10.235.0.0/16"
"gke-pre-service-cidr" = "10.236.0.0/16"
......@@ -191,6 +193,7 @@ variable "public_ports" {
"fe-lb" = [22, 80, 443]
"gitaly" = []
"deploy" = []
"consul" = []
}
}
......@@ -214,6 +217,7 @@ variable "node_count" {
"fe-lb-registry" = 1
"gitaly" = 1
"deploy" = 1
"consul" = 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