Commit eb40cb22 authored by Craig Miskell's avatar Craig Miskell

Merge branch 'convert-pre-monitoring-lb-to-https-lb' into 'master'

Convert monitoring-lb in pre env to https-lb

See merge request !860
parents 5ff787c2 2c94b80b
......@@ -72,18 +72,19 @@ resource "google_compute_subnetwork" "monitoring" {
#######################
module "monitoring-lb" {
cert_link = "${var.monitoring_cert_link}"
environment = "${var.environment}"
gitlab_net_zone_id = "${var.gitlab_net_zone_id}"
hosts = ["${var.monitoring_hosts["names"]}"]
name = "monitoring-lb"
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
cert_link = "${var.monitoring_cert_link}"
environment = "${var.environment}"
dns_zone_id = "${var.gitlab_net_zone_id}"
dns_zone_name = "pre.gitlab.net"
hosts = ["${var.monitoring_hosts["names"]}"]
name = "monitoring-lb"
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/https-lb.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
}
#######################
......
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