Commit c8e0a653 authored by Michal Wasilewski's avatar Michal Wasilewski

remove duplicate pubsubbeat machines from gstg

Signed-off-by: Michal Wasilewski's avatarMichal Wasilewski <[email protected]>
parent b34326ec
......@@ -1414,38 +1414,6 @@ module "pubsubbeat" {
vpc = module.network.self_link
}
module "pubsubbeat-duplicate" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-infra-pubsub-duplicate]\""
create_topics = false
dns_zone_name = var.dns_zone_name
egress_ports = var.egress_ports
environment = var.environment
health_check = "tcp"
ip_cidr_range = var.subnetworks["pubsubbeat-duplicate"]
machine_types = var.pubsubbeats["machine_types"]
name = "pubsub-duplicate"
names = var.pubsubbeats["names"]
project = var.project
public_ports = var.public_ports["pubsubbeat"]
region = var.region
service_account_email = var.service_account_email
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git?ref=v5.0.0"
tier = "inf"
topic_names = formatlist(
"%v-%v-%v-%v",
"pubsub",
var.pubsubbeats["names"],
"inf",
var.environment,
)
use_new_node_name = true
vpc = module.network.self_link
}
##################################
#
# Monitoring
......
......@@ -470,7 +470,6 @@ variable "subnetworks" {
"pgbouncer" = "10.224.9.0/24"
"pgbouncer-sidekiq" = "10.224.10.0/24"
"pubsubbeat" = "10.226.2.0/24"
"pubsubbeat-duplicate" = "10.226.6.0/24"
"redis" = "10.224.7.0/24"
"redis-cache" = "10.224.8.0/24"
"redis-sidekiq" = "10.224.22.0/24"
......
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