diff --git a/ansible/requirements.yml b/ansible/requirements.yml index e52aa61..ab482bd 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -11,17 +11,17 @@ - name: infra-role-bootstrap src: git@github.com:status-im/infra-role-bootstrap.git - version: 0aca5b6927373c04b9713408e9d6b9284a906d75 + version: c1f535e4b2851f08b1013bd57ab42d0c1e31e3b2 scm: git - name: consul-service src: git@github.com:status-im/infra-role-consul-service.git - version: b1d5ad5caa7d7a036fd175292fa497175bb7c54c + version: 87f4498f90f0cbb66a1ddb425e8953b04ced1891 scm: git - name: systemd-timer src: git@github.com:status-im/infra-role-systemd-timer.git - version: b4ef4557682ff5cf1e7da841cbfb195992589f60 + version: 5eafd38e4374f56a3439232b72ec077d569e0f5c scm: git - name: swap-file diff --git a/hosts.tf b/hosts.tf index ffd0d00..8b2c42d 100644 --- a/hosts.tf +++ b/hosts.tf @@ -11,7 +11,7 @@ module "hive_master" { domain = var.hosts_domain /* Application Web UI */ - open_tcp_ports = [ "80", "443" ] + open_tcp_ports = ["80", "443"] } /* Backend storage */ @@ -27,5 +27,5 @@ module "hive_slave" { domain = var.hosts_domain /* ElasticSearch HQ Web UI */ - open_tcp_ports = [ "80", "443" ] + open_tcp_ports = ["80", "443"] } diff --git a/main.tf b/main.tf index 8eaeb08..945d29a 100644 --- a/main.tf +++ b/main.tf @@ -23,7 +23,7 @@ data "cloudflare_zones" "active" { /* For easier access to zone ID by domain name */ locals { zones = { - for zone in data.cloudflare_zones.active.zones: - zone.name => zone.id + for zone in data.cloudflare_zones.active.zones : + zone.name => zone.id } } diff --git a/secrets.tf b/secrets.tf index c3cebf1..64ebb39 100644 --- a/secrets.tf +++ b/secrets.tf @@ -1,5 +1,5 @@ # Uses PASSWORD_STORE_DIR environment variable -provider "pass" { } +provider "pass" {} /* Token for interacting with Cloudflare API. */ data "pass_password" "cloudflare_token" { diff --git a/versions.tf b/versions.tf index 71fafa5..6e0fd1c 100644 --- a/versions.tf +++ b/versions.tf @@ -1,13 +1,9 @@ terraform { - required_version = "~> 0.14.4" + required_version = "~> 1.0.0" required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = " = 2.10.1" - } - google = { - source = "hashicorp/google" - version = " = 3.42.0" + version = " = 2.21.0" } ansible = { source = "nbering/ansible" @@ -17,5 +13,8 @@ terraform { source = "camptocamp/pass" version = " = 2.0.0" } + google = { + source = "hashicorp/google" + } } }