diff --git a/ansible/inventory/prod b/ansible/inventory/prod index b0f8524..62e7efb 100644 --- a/ansible/inventory/prod +++ b/ansible/inventory/prod @@ -1,7 +1,7 @@ # NOTE: This file is generated by terraform.py # For emergency use when Consul fails [all] -master-01.gc-us-central1-a.faucet.prod hostname=master-01.gc-us-central1-a.faucet.prod ansible_host=104.198.219.13 env=faucet stage=prod data_center=gc-us-central1-a region=us-central1-a dns_entry=master-01.gc-us-central1-a.faucet.prod.statusim.net +master-01.gc-us-central1-a.faucet.prod hostname=master-01.gc-us-central1-a.faucet.prod ansible_host=104.198.219.13 env=faucet stage=prod data_center=gc-us-central1-a region=us-central1-a dns_entry=master-01.gc-us-central1-a.faucet.prod.status.im [faucet-master] master-01.gc-us-central1-a.faucet.prod diff --git a/hosts.tf b/hosts.tf index f909e40..d189ba8 100644 --- a/hosts.tf +++ b/hosts.tf @@ -7,7 +7,6 @@ module "main" { host_count = 1 root_vol_size = 30 data_vol_size = 250 - domain = var.domain open_tcp_ports = [ "80", /* HTTP */ diff --git a/providers.tf b/providers.tf index 7dd2737..9f00446 100644 --- a/providers.tf +++ b/providers.tf @@ -7,5 +7,4 @@ provider "google" { provider "cloudflare" { email = data.pass_password.cloudflare_email.password api_key = data.pass_password.cloudflare_token.password - account_id = data.pass_password.cloudflare_account.password } diff --git a/secrets.tf b/secrets.tf index 64ebb39..8c2bd6a 100644 --- a/secrets.tf +++ b/secrets.tf @@ -11,11 +11,6 @@ data "pass_password" "cloudflare_email" { path = "cloud/Cloudflare/email" } -/* ID of CloudFlare Account. */ -data "pass_password" "cloudflare_account" { - path = "cloud/Cloudflare/account" -} - /* Google Cloud API auth JSON */ data "pass_password" "google_cloud_cred_json" { path = "cloud/GoogleCloud/json" diff --git a/variables.tf b/variables.tf deleted file mode 100644 index f3444e4..0000000 --- a/variables.tf +++ /dev/null @@ -1,6 +0,0 @@ -/* GENERAL --------------------------------------*/ - -variable "domain" { - description = "DNS Domain to update" - default = "statusim.net" -} diff --git a/versions.tf b/versions.tf index d5227b7..32f4aba 100644 --- a/versions.tf +++ b/versions.tf @@ -3,14 +3,13 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = " = 2.21.0" + } + google = { + source = "hashicorp/google" } pass = { source = "camptocamp/pass" version = " = 2.0.0" } - google = { - source = "hashicorp/google" - } } }