From c4436f71f441152b2e871ef5c75789ae811090c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 28 Feb 2022 13:14:04 +0100 Subject: [PATCH] drop windows-01.gc-us-central1-a.nimbus.prater MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced by `windows-01.he-eu-hel1.nimbus.prater` due to disk space constraints and high cost of Google Cloud host. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 2 +- ansible/inventory/test | 6 ------ outputs.tf | 2 +- prater.tf | 27 --------------------------- 4 files changed, 2 insertions(+), 35 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 361bbb3..56cf4ea 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -61,7 +61,7 @@ nodes_layout: - { branch: 'testing', start: 8000, end: 10000, build_start: '15:00:00' } - { branch: 'unstable', start: 12000, end: 14000, build_start: '16:00:00' } - 'windows-01.gc-us-central1-a.nimbus.prater': # 2000 each + 'windows-01.he-eu-hel1.nimbus.prater': # 2000 each - { branch: 'stable', start: 14000, end: 16000, build_start: '13:00:00' } - { branch: 'testing', start: 16000, end: 18000, build_start: '15:00:00' } - { branch: 'unstable', start: 18000, end: 20000, build_start: '16:00:00' } diff --git a/ansible/inventory/test b/ansible/inventory/test index 8519407..5f7a9db 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -30,7 +30,6 @@ store-02.he-eu-hel1.logs.nimbus hostname=store-02.he-eu-hel1.logs.nimbus ansible store-03.he-eu-hel1.logs.nimbus hostname=store-03.he-eu-hel1.logs.nimbus ansible_host=65.108.129.57 env=logs stage=nimbus data_center=he-eu-hel1 region=eu-hel1 dns_entry=store-03.he-eu-hel1.logs.nimbus.statusim.net testing-large-01.aws-eu-central-1a.nimbus.prater hostname=testing-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.65.99.236 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=testing-large-01.aws-eu-central-1a.nimbus.prater.statusim.net unstable-large-01.aws-eu-central-1a.nimbus.prater hostname=unstable-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.65.85.130 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=unstable-large-01.aws-eu-central-1a.nimbus.prater.statusim.net -windows-01.gc-us-central1-a.nimbus.prater hostname=windows-01.gc-us-central1-a.nimbus.prater ansible_host=35.232.80.244 env=nimbus stage=prater data_center=gc-us-central1-a region=us-central1-a dns_entry=windows-01.gc-us-central1-a.nimbus.prater.statusim.net windows-01.he-eu-hel1.nimbus.prater hostname=windows-01.he-eu-hel1.nimbus.prater ansible_host=65.21.233.67 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=windows-01.he-eu-hel1.nimbus.prater.statusim.net [aws-eu-central-1a] @@ -46,9 +45,6 @@ unstable-large-01.aws-eu-central-1a.nimbus.prater [dash.nimbus] node-01.aws-eu-central-1a.dash.nimbus -[gc-us-central1-a] -windows-01.gc-us-central1-a.nimbus.prater - [he-eu-hel1] mainnet-01.he-eu-hel1.nimbus.openeth metal-01.he-eu-hel1.nimbus.eth1 @@ -129,7 +125,6 @@ testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater [nimbus-prater-windows] -windows-01.gc-us-central1-a.nimbus.prater windows-01.he-eu-hel1.nimbus.prater [nimbus-pyrmont-metal] @@ -168,7 +163,6 @@ metal-07.he-eu-hel1.nimbus.prater stable-large-01.aws-eu-central-1a.nimbus.prater testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater -windows-01.gc-us-central1-a.nimbus.prater windows-01.he-eu-hel1.nimbus.prater [nimbus.pyrmont] diff --git a/outputs.tf b/outputs.tf index d156f45..445c9ab 100644 --- a/outputs.tf +++ b/outputs.tf @@ -10,7 +10,7 @@ output "hosts" { module.nimbus_nodes_prater_stable_large.hosts, module.nimbus_nodes_prater_testing_large.hosts, module.nimbus_nodes_prater_unstable_large.hosts, - module.nimbus_nodes_prater_unstable_windows.hosts, + module.nimbus_nodes_prater_windows.hosts, module.nimbus_nodes_prater_hetzner.hosts, module.nimbus_nodes_prater_macos.hosts, ) diff --git a/prater.tf b/prater.tf index fa36be4..e2bab7a 100644 --- a/prater.tf +++ b/prater.tf @@ -88,33 +88,6 @@ module "nimbus_nodes_prater_unstable_large" { keypair_name = aws_key_pair.arthurk.key_name } -module "nimbus_nodes_prater_unstable_windows" { - source = "github.com/status-im/infra-tf-google-cloud" - - /* Specific */ - name = "windows" - env = "nimbus" - stage = "prater" - group = "nimbus-prater-windows" - domain = var.domain - zone = "us-central1-a" - - /* System */ - image = "windows-cloud/windows-server-2019-dc-v20210608" - win_password = data.pass_password.windows_user_pass.password - ansible_playbook = "${path.cwd}/ansible/bootstrap-win.yml" - - /* Firewall */ - open_udp_ports = local.nimbus_ports - open_tcp_ports = local.nimbus_ports - - /* Scaling */ - type = "c2-standard-8" /* 4 vCPUs, 16GB RAM */ - host_count = 1 - root_vol_size = 200 - root_vol_type = "pd-ssd" -} - module "nimbus_nodes_prater_windows" { source = "./modules/dummy-module"