Commit 337f4ff1 authored by Craig Furman's avatar Craig Furman

Merge branch 'craigf/0.12upgrade-dr' into 'master'

Upgrade dr to Terraform 0.12

See merge request !1011
parents 73c5d9ca de9bfe33
......@@ -4,8 +4,8 @@
# services
resource "google_compute_url_map" "monitoring-lb" {
name = "${format("%v-monitoring-lb", var.environment)}"
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
name = format("%v-monitoring-lb", var.environment)
default_service = module.prometheus.google_compute_backend_service_self_link
host_rule {
hosts = ["prometheus.dr.gitlab.net"]
......@@ -14,11 +14,11 @@ resource "google_compute_url_map" "monitoring-lb" {
path_matcher {
name = "prometheus"
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
default_service = module.prometheus.google_compute_backend_service_self_link
path_rule {
paths = ["/*"]
service = "${module.prometheus.google_compute_backend_service_self_link}"
service = module.prometheus.google_compute_backend_service_self_link
}
}
......@@ -30,11 +30,12 @@ resource "google_compute_url_map" "monitoring-lb" {
}
path_matcher {
name = "prometheus-app"
default_service = "${module.prometheus-app.google_compute_backend_service_self_link}"
default_service = module.prometheus-app.google_compute_backend_service_self_link
path_rule {
paths = ["/*"]
service = "${module.prometheus-app.google_compute_backend_service_self_link}"
service = module.prometheus-app.google_compute_backend_service_self_link
}
}
}
This diff is collapsed.
This diff is collapsed.
terraform {
required_version = ">= 0.12"
}
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