From 66da797fb2432695babaca996d83891922e2f942 Mon Sep 17 00:00:00 2001 From: Anton Iakimov Date: Tue, 10 Oct 2023 13:14:21 +0200 Subject: [PATCH] terraform: add node-db nodes --- ansible/group_vars/{waku.yml => node.yml} | 0 ansible/inventory/test | 16 +++++++++++++++- hosts.tf => hosts_node.tf | 11 ++++++----- hosts_node_db.tf | 23 +++++++++++++++++++++++ workspaces.tf | 3 ++- 5 files changed, 46 insertions(+), 7 deletions(-) rename ansible/group_vars/{waku.yml => node.yml} (100%) rename hosts.tf => hosts_node.tf (77%) create mode 100644 hosts_node_db.tf diff --git a/ansible/group_vars/waku.yml b/ansible/group_vars/node.yml similarity index 100% rename from ansible/group_vars/waku.yml rename to ansible/group_vars/node.yml diff --git a/ansible/inventory/test b/ansible/inventory/test index ef9254f..b518f43 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -4,23 +4,37 @@ node-01.ac-cn-hongkong-c.waku.test hostname=node-01.ac-cn-hongkong-c.waku.test ansible_host=8.218.219.107 env=waku stage=test data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=node-01.ac-cn-hongkong-c.waku.test.statusim.net node-01.do-ams3.waku.test hostname=node-01.do-ams3.waku.test ansible_host=178.128.141.171 env=waku stage=test data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.waku.test.statusim.net node-01.gc-us-central1-a.waku.test hostname=node-01.gc-us-central1-a.waku.test ansible_host=34.16.1.67 env=waku stage=test data_center=gc-us-central1-a region=us-central1-a dns_entry=node-01.gc-us-central1-a.waku.test.statusim.net +node-db-01.ac-cn-hongkong-c.waku.test hostname=node-db-01.ac-cn-hongkong-c.waku.test ansible_host=47.242.250.52 env=waku stage=test data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=node-db-01.ac-cn-hongkong-c.waku.test.statusim.net +node-db-01.do-ams3.waku.test hostname=node-db-01.do-ams3.waku.test ansible_host=167.99.18.178 env=waku stage=test data_center=do-ams3 region=ams3 dns_entry=node-db-01.do-ams3.waku.test.statusim.net +node-db-01.gc-us-central1-a.waku.test hostname=node-db-01.gc-us-central1-a.waku.test ansible_host=34.31.46.124 env=waku stage=test data_center=gc-us-central1-a region=us-central1-a dns_entry=node-db-01.gc-us-central1-a.waku.test.statusim.net [ac-cn-hongkong-c] node-01.ac-cn-hongkong-c.waku.test +node-db-01.ac-cn-hongkong-c.waku.test [do-ams3] node-01.do-ams3.waku.test +node-db-01.do-ams3.waku.test [gc-us-central1-a] node-01.gc-us-central1-a.waku.test +node-db-01.gc-us-central1-a.waku.test -[waku] +[node] node-01.ac-cn-hongkong-c.waku.test node-01.do-ams3.waku.test node-01.gc-us-central1-a.waku.test +[node-db] +node-db-01.ac-cn-hongkong-c.waku.test +node-db-01.do-ams3.waku.test +node-db-01.gc-us-central1-a.waku.test + [waku.test] node-01.ac-cn-hongkong-c.waku.test node-01.do-ams3.waku.test node-01.gc-us-central1-a.waku.test +node-db-01.ac-cn-hongkong-c.waku.test +node-db-01.do-ams3.waku.test +node-db-01.gc-us-central1-a.waku.test diff --git a/hosts.tf b/hosts_node.tf similarity index 77% rename from hosts.tf rename to hosts_node.tf index 31302d6..d5a03f0 100644 --- a/hosts.tf +++ b/hosts_node.tf @@ -1,8 +1,9 @@ -module "hosts" { +module "node" { source = "github.com/status-im/infra-tf-multi-provider" /* node type */ - group = "waku" + name = "node" + group = "node" env = "waku" stage = terraform.workspace domain = var.domain @@ -16,9 +17,9 @@ module "hosts" { gc_type = local.ws["gc_type"] /* Google Cloud */ /* data volumes */ - ac_data_vol_size = local.ws["data_vol_size"] - do_data_vol_size = local.ws["data_vol_size"] - gc_data_vol_size = local.ws["data_vol_size"] + ac_data_vol_size = local.ws["node_data_vol_size"] + do_data_vol_size = local.ws["node_data_vol_size"] + gc_data_vol_size = local.ws["node_data_vol_size"] /* firewall */ open_tcp_ports = [ diff --git a/hosts_node_db.tf b/hosts_node_db.tf new file mode 100644 index 0000000..8d91e22 --- /dev/null +++ b/hosts_node_db.tf @@ -0,0 +1,23 @@ +module "node-db" { + source = "github.com/status-im/infra-tf-multi-provider" + + /* node type */ + name = "node-db" + group = "node-db" + env = "waku" + stage = terraform.workspace + domain = var.domain + + /* scaling */ + host_count = local.ws["hosts_count"] + + /* instance sizes */ + do_type = local.ws["do_type"] /* DigitalOcean */ + ac_type = local.ws["ac_type"] /* Alibaba Cloud */ + gc_type = local.ws["gc_type"] /* Google Cloud */ + + /* data volumes */ + ac_data_vol_size = local.ws["node_db_data_vol_size"] + do_data_vol_size = local.ws["node_db_data_vol_size"] + gc_data_vol_size = local.ws["node_db_data_vol_size"] +} diff --git a/workspaces.tf b/workspaces.tf index a7e9895..f280845 100644 --- a/workspaces.tf +++ b/workspaces.tf @@ -17,7 +17,8 @@ locals { ac_type = "ecs.t5-lc1m2.small" /* Alibaba Cloud */ gc_type = "g1-small" /* Google Cloud */ - data_vol_size = 40 + node_data_vol_size = 40 + node_db_data_vol_size = 40 } # Inherits defaults.