Commit bf52d689 authored by Ilya Frolov's avatar Ilya Frolov

move consuls to different module

parent 7a3bff5e
......@@ -658,7 +658,8 @@ module "consul" {
project = "${var.project}"
public_ports = "${var.public_ports["consul"]}"
region = "${var.region}"
source = "../../modules/google/generic-nodisk"
service_port = 8300
source = "../../modules/google/generic-sv-with-group"
tier = "inf"
vpc = "${module.network.self_link}"
}
......@@ -842,25 +843,23 @@ module "alerts" {
##################################
module "deploy" {
block_project_ssh_keys = "TRUE"
bootstrap_version = 3
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-deploy-node]\""
dns_zone_name = "${var.dns_zone_name}"
enable_oslogin = "FALSE"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["deploy"]}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy"
node_count = "${var.node_count["deploy"]}"
project = "${var.project}"
public_ports = "${var.public_ports["deploy"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "sv"
vpc = "${module.network.self_link}"
bootstrap_version = 3
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-deploy-node]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["deploy"]}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy"
node_count = "${var.node_count["deploy"]}"
project = "${var.project}"
public_ports = "${var.public_ports["deploy"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "sv"
vpc = "${module.network.self_link}"
}
##################################
......@@ -917,23 +916,21 @@ module "runner" {
##################################
module "bastion" {
block_project_ssh_keys = "TRUE"
bootstrap_version = 3
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-bastion]\""
dns_zone_name = "${var.dns_zone_name}"
enable_oslogin = "FALSE"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["bastion"]}"
machine_type = "${var.machine_types["bastion"]}"
name = "bastion"
node_count = "${var.node_count["bastion"]}"
project = "${var.project}"
public_ports = "${var.public_ports["bastion"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "inf"
vpc = "${module.network.self_link}"
bootstrap_version = 3
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-bastion]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["bastion"]}"
machine_type = "${var.machine_types["bastion"]}"
name = "bastion"
node_count = "${var.node_count["bastion"]}"
project = "${var.project}"
public_ports = "${var.public_ports["bastion"]}"
region = "${var.region}"
source = "../../modules/google/generic-sv-with-group"
health_check = "tcp"
service_port = 22
tier = "inf"
vpc = "${module.network.self_link}"
}
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_DNS_ZONE_NAME" = "${var.dns_zone_name}"
"CHEF_ENVIRONMENT" = "${var.environment}"
"CHEF_NODE_NAME" = "${format("%v-%02d.%v.%v.%v", var.name, count.index + 1, var.tier, var.environment, var.dns_zone_name)}"
"CHEF_PROJECT" = "${var.project}"
"CHEF_RUN_LIST" = "${var.chef_run_list}"
"CHEF_URL" = "${var.chef_provision.["server_url"]}"
"CHEF_VERSION" = "${var.chef_provision.["version"]}"
"block-project-ssh-keys" = "${var.block_project_ssh_keys}"
"enable-oslogin" = "${var.enable_oslogin}"
"shutdown-script" = "${file("${path.module}/../../../scripts/google/teardown-v1.sh")}"
}
metadata_startup_script = "${file("${path.module}/../../../scripts/google/bootstrap-v${var.bootstrap_version}.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 "block_project_ssh_keys" {
type = "string"
description = "Whether to block project level ssh keys on GCP instances"
default = "TRUE"
}
variable "bootstrap_version" {
description = "version of the bootstrap script"
default = 1
}
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 "enable_oslogin" {
type = "string"
description = "Whether to enable OS Login GCP feature"
# Note: setting this to TRUE breaks chef!
# https://gitlab.com/gitlab-com/gitlab-com-infrastructure/merge_requests/297#note_66690562
default = "FALSE"
}
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