Commit 54721cf6 authored by John Jarvis's avatar John Jarvis

Merge branch 'jarv/add-consul-servers' into 'master'

Add consul servers to gprd.

See merge request !249
parents 9afa97a0 d539f705
......@@ -431,6 +431,29 @@ module "google_load_balancers" {
fe_ssh_instances = "${module.fe-lb.instances_without_attached_disk_self_link}"
}
##################################
#
# Consul
#
##################################
module "consul" {
chef_provision = "${var.chef_provision}"
chef_run_list = "${var.base_chef_run_list}"
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}"
source = "../../modules/google/generic-nodisk"
tier = "inf"
vpc = "${module.network.self_link}"
}
##################################
#
# VPN connection to Azure
......
......@@ -11,6 +11,7 @@ variable "public_ports" {
default = {
"api" = [22]
"consul" = [22]
"db" = [22]
"pgb" = [22]
"fe-lb" = [22, 80, 443, 2222]
......@@ -57,11 +58,12 @@ variable "machine_types" {
default = {
"api" = "n1-standard-8"
"consul" = "n1-standard-4"
"db" = "n1-highmem-32"
"pgb" = "n1-standard-4"
"fe-lb" = "n1-standard-4"
"geodb" = "n1-highmem-32"
"git" = "n1-standard-16"
"pgb" = "n1-standard-4"
"redis" = "n1-highmem-2"
"redis-cache" = "n1-highmem-16"
"sidekiq-besteffort" = "n1-standard-64"
......@@ -75,20 +77,21 @@ variable "node_count" {
default = {
"api" = 1
"artifacts" = 1
"consul" = 3
"db" = 1
"pgb" = 1
"fe-lb" = 2
"geodb" = 1
"git" = 1
"lfs" = 1
"pages" = 1
"pgb" = 1
"redis" = 1
"redis-cache" = 1
"sidekiq-besteffort" = 6
"share" = 1
"sidekiq-besteffort" = 5
"stor" = 16
"web" = 1
"lfs" = 1
"pages" = 1
"artifacts" = 1
"share" = 1
}
}
......@@ -97,6 +100,7 @@ variable "subnetworks" {
default = {
"api" = "10.220.2.0/23"
"consul" = "10.218.1.0/24"
"db" = "10.217.1.0/24"
"fe-lb" = "10.216.1.0/24"
"geodb" = "10.217.6.0/24"
......@@ -112,10 +116,10 @@ variable "subnetworks" {
# These will eventually (tm) be
# moved to object storage
"share" = "10.221.4.0/27" # 10.221.4.0 - 10.221.4.31
"artifacts" = "10.221.4.96/27" # 10.221.4.96 - 10.221.4.127
"lfs" = "10.221.4.32/27" # 10.221.4.32 - 10.221.4.63
"pages" = "10.221.4.64/27" # 10.221.4.64 - 10.221.4.95
"artifacts" = "10.221.4.96/27" # 10.221.4.96 - 10.221.4.127
"share" = "10.221.4.0/27" # 10.221.4.0 - 10.221.4.31
#############################
}
......
data "google_compute_zones" "available" {
region = "${var.region}"
status = "UP"
}
resource "google_compute_firewall" "public" {
count = "${length(var.public_ports) > 0 ? 1 : 0}"
name = "${format("%v-%v", var.name, var.environment)}"
network = "${var.vpc}"
allow {
protocol = "tcp"
ports = ["${var.public_ports}"]
}
source_ranges = ["0.0.0.0/0"]
target_tags = ["${var.name}"]
}
resource "google_compute_address" "static-ip-address" {
count = "${var.node_count}"
name = "${format("%v-%02d-%v-%v-static-ip", var.name, count.index + 1 + 100, var.tier, var.environment)}"
address_type = "INTERNAL"
address = "${replace(var.ip_cidr_range, "/\\d+\\/\\d+$/", count.index + 1 + 100)}"
subnetwork = "${google_compute_subnetwork.subnetwork.self_link}"
}
resource "google_compute_instance" "instance_without_attached_disk" {
count = "${var.node_count}"
name = "${format("%v-%02d-%v-%v", var.name, count.index + 1, var.tier, var.environment)}"
machine_type = "${var.machine_type}"
metadata = {
"CHEF_URL" = "${var.chef_provision.["server_url"]}"
"CHEF_VERSION" = "${var.chef_provision.["version"]}"
"CHEF_NODE_NAME" = "${format("%v-%02d.%v.%v.%v", var.name, count.index + 1, var.tier, var.environment, var.dns_zone_name)}"
"CHEF_ENVIRONMENT" = "${var.environment}"
"CHEF_RUN_LIST" = "${var.chef_run_list}"
"CHEF_DNS_ZONE_NAME" = "${var.dns_zone_name}"
"CHEF_PROJECT" = "${var.project}"
}
metadata_startup_script = "${file("${path.module}/../../../scripts/google/generic-pet-bootstrap.sh")}"
project = "${var.project}"
zone = "${var.zone != "" ? var.zone : data.google_compute_zones.available.names[(count.index + 1) % length(data.google_compute_zones.available.names)]}"
service_account {
// this should be the instance under which the instance should be running, rather than the one creating it...
email = "[email protected]"
// all the defaults plus cloudkms to access kms
scopes = [
"https://www.googleapis.com/auth/cloud.useraccounts.readonly",
"https://www.googleapis.com/auth/devstorage.read_only",
"https://www.googleapis.com/auth/logging.write",
"https://www.googleapis.com/auth/monitoring.write",
"https://www.googleapis.com/auth/pubsub",
"https://www.googleapis.com/auth/service.management.readonly",
"https://www.googleapis.com/auth/servicecontrol",
"https://www.googleapis.com/auth/trace.append",
"https://www.googleapis.com/auth/cloudkms",
"https://www.googleapis.com/auth/compute.readonly",
]
}
scheduling {
preemptible = "${var.preemptible}"
}
boot_disk {
auto_delete = true
initialize_params {
image = "${var.os_boot_image}"
size = "${var.os_disk_size}"
type = "${var.os_disk_type}"
}
}
network_interface {
subnetwork = "${google_compute_subnetwork.subnetwork.name}"
address = "${google_compute_address.static-ip-address.*.address[count.index]}"
access_config = {}
}
labels {
environment = "${var.environment}"
pet_name = "${var.name}"
}
tags = [
"${var.name}",
"${var.environment}",
]
provisioner "local-exec" {
when = "destroy"
command = "knife node delete ${format("%v-%02d.%v.%v.%v", var.name, count.index + 1, var.tier, var.environment, var.dns_zone_name)} -y; knife client delete ${format("%v-%02d.%v.%v.%v", var.name, count.index + 1, var.tier, var.environment, var.dns_zone_name)} -y; exit 0"
}
}
output "instances_without_attached_disk_self_link" {
value = "${google_compute_instance.instance_without_attached_disk.*.self_link}"
}
resource "google_compute_subnetwork" "subnetwork" {
count = "${var.node_count > 0 ? 1 : 0}"
name = "${format("%v-%v", var.name, var.environment)}"
network = "${var.vpc}"
project = "${var.project}"
region = "${var.region}"
ip_cidr_range = "${var.ip_cidr_range}"
private_ip_google_access = true
}
variable "chef_provision" {
type = "map"
description = "Configuration details for chef server"
}
variable "chef_run_list" {
type = "string"
description = "run_list for the node in chef"
}
variable "dns_zone_name" {
type = "string"
description = "The GCP name of the DNS zone to use for this environment"
}
variable "environment" {
type = "string"
description = "The environment name"
}
variable "ip_cidr_range" {
type = "string"
description = "The IP range"
}
variable "machine_type" {
type = "string"
description = "The machine size"
}
variable "name" {
type = "string"
description = "The pet name"
}
variable "node_count" {
type = "string"
description = "The nodes count"
}
variable "os_boot_image" {
type = "string"
description = "The OS image to boot"
default = "ubuntu-os-cloud/ubuntu-1604-xenial-v20180122"
}
variable "os_disk_size" {
type = "string"
description = "The OS disk size in GiB"
default = 20
}
variable "os_disk_type" {
type = "string"
description = "The OS disk type"
default = "pd-standard"
}
variable "preemptible" {
type = "string"
description = "Use preemptible instances for this pet"
default = "false"
}
variable "project" {
type = "string"
description = "The project name"
}
variable "public_ports" {
type = "list"
description = "The list of ports that should be publicly reachable"
default = []
}
variable "region" {
type = "string"
description = "The target region"
}
variable "tier" {
type = "string"
description = "The tier for this service"
}
variable "vpc" {
type = "string"
description = "The target network"
}
variable "zone" {
type = "string"
default = ""
}
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