Commit f293feb6 authored by Alejandro Rodriguez's avatar Alejandro Rodriguez

Merge branch 'ops-consul' into 'master'

Add consul module in ops

See merge request !859
parents eb40cb22 538e873d
......@@ -650,6 +650,33 @@ 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"]}"
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://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.5"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# Runner
......
......@@ -34,6 +34,7 @@ variable "machine_types" {
default = {
"alerts" = "n1-standard-1"
"aptly" = "n1-standard-1"
"consul" = "n1-standard-1"
"log-proxy" = "n1-standard-1"
"proxy" = "n1-standard-1"
"bastion" = "n1-standard-1"
......@@ -100,6 +101,7 @@ variable "subnetworks" {
"thanos-store" = "10.250.18.0/24"
"thanos-compact" = "10.250.19.0/24"
"aptly" = "10.250.20.0/24"
"consul" = "10.250.21.0/24"
}
}
......@@ -120,6 +122,7 @@ variable "public_ports" {
"thanos" = []
"nessus" = [8834]
"aptly" = [80]
"consul" = []
}
}
......@@ -130,6 +133,7 @@ variable "node_count" {
"alerts" = 2
"bastion" = 1
"blackbox" = 1
"consul" = 1
"dashboards" = 1
"gitlab-ops" = 1
"nessus" = 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