Commit 4e4e7e93 authored by Craig Furman's avatar Craig Furman

Merge branch 'craigf/bump-generic-stor' into 'master'

Bump generic-stor

See merge request !823
parents da91fb58 0c6e89cc
...@@ -273,7 +273,7 @@ module "geo-postgres" { ...@@ -273,7 +273,7 @@ module "geo-postgres" {
public_ports = "${var.public_ports["geodb"]}" public_ports = "${var.public_ports["geodb"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "db" tier = "db"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -303,7 +303,7 @@ module "redis" { ...@@ -303,7 +303,7 @@ module "redis" {
public_ports = "${var.public_ports["redis"]}" public_ports = "${var.public_ports["redis"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "db" tier = "db"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -378,7 +378,7 @@ module "file" { ...@@ -378,7 +378,7 @@ module "file" {
public_ports = "${var.public_ports["stor"]}" public_ports = "${var.public_ports["stor"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "stor" tier = "stor"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -413,7 +413,7 @@ module "pages" { ...@@ -413,7 +413,7 @@ module "pages" {
public_ports = "${var.public_ports["stor"]}" public_ports = "${var.public_ports["stor"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "stor" tier = "stor"
use_new_node_name = true use_new_node_name = true
use_external_ip = true use_external_ip = true
...@@ -771,7 +771,7 @@ module "thanos-store" { ...@@ -771,7 +771,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -796,7 +796,7 @@ module "thanos-compact" { ...@@ -796,7 +796,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
......
...@@ -352,7 +352,7 @@ module "thanos-store" { ...@@ -352,7 +352,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -375,7 +375,7 @@ module "thanos-compact" { ...@@ -375,7 +375,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -838,7 +838,7 @@ module "sentry" { ...@@ -838,7 +838,7 @@ module "sentry" {
public_ports = "${var.public_ports["sentry"]}" public_ports = "${var.public_ports["sentry"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -881,7 +881,7 @@ module "aptly" { ...@@ -881,7 +881,7 @@ module "aptly" {
public_ports = "${var.public_ports["aptly"]}" public_ports = "${var.public_ports["aptly"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "sv" tier = "sv"
use_external_ip = true use_external_ip = true
use_new_node_name = true use_new_node_name = true
......
...@@ -854,7 +854,7 @@ module "thanos-compact" { ...@@ -854,7 +854,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -878,7 +878,7 @@ module "thanos-store" { ...@@ -878,7 +878,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
......
...@@ -409,7 +409,7 @@ module "postgres-dr-archive" { ...@@ -409,7 +409,7 @@ module "postgres-dr-archive" {
public_ports = "${var.public_ports["db-dr"]}" public_ports = "${var.public_ports["db-dr"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "db" tier = "db"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -433,7 +433,7 @@ module "postgres-dr-delayed" { ...@@ -433,7 +433,7 @@ module "postgres-dr-delayed" {
public_ports = "${var.public_ports["db-dr"]}" public_ports = "${var.public_ports["db-dr"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "db" tier = "db"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -636,7 +636,7 @@ module "redis" { ...@@ -636,7 +636,7 @@ module "redis" {
public_ports = "${var.public_ports["redis"]}" public_ports = "${var.public_ports["redis"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "db" tier = "db"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -770,7 +770,7 @@ module "file" { ...@@ -770,7 +770,7 @@ module "file" {
public_ports = "${var.public_ports["stor"]}" public_ports = "${var.public_ports["stor"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "stor" tier = "stor"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -814,7 +814,7 @@ module "share" { ...@@ -814,7 +814,7 @@ module "share" {
public_ports = "${var.public_ports["stor"]}" public_ports = "${var.public_ports["stor"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "stor" tier = "stor"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -851,7 +851,7 @@ module "pages" { ...@@ -851,7 +851,7 @@ module "pages" {
public_ports = "${var.public_ports["stor"]}" public_ports = "${var.public_ports["stor"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "stor" tier = "stor"
use_new_node_name = true use_new_node_name = true
use_external_ip = true use_external_ip = true
...@@ -1428,7 +1428,7 @@ module "influxdb" { ...@@ -1428,7 +1428,7 @@ module "influxdb" {
public_ports = "${var.public_ports["influxdb"]}" public_ports = "${var.public_ports["influxdb"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -1453,7 +1453,7 @@ module "thanos-store" { ...@@ -1453,7 +1453,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -1478,7 +1478,7 @@ module "thanos-compact" { ...@@ -1478,7 +1478,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}" public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0" source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.1"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.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