diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 40f35c14..774eaff4 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -195,6 +195,10 @@ nodes_layout: - { branch: 'testing', start: 6000, end: 9000, build_start: '13:00:00' } - { branch: 'unstable', start: 9000, end: 10000, build_start: '15:00:00' } + 'macm1-01.ih-eu-mda1.nimbus.prater': # 0 each + - { branch: 'testing', build_start: '13:00:00' } + - { branch: 'unstable', build_start: '15:00:00' } + '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' } diff --git a/ansible/host_vars/macm1-01.ih-eu-mda1.nimbus.prater.yml b/ansible/host_vars/macm1-01.ih-eu-mda1.nimbus.prater.yml new file mode 100644 index 00000000..c10ababc --- /dev/null +++ b/ansible/host_vars/macm1-01.ih-eu-mda1.nimbus.prater.yml @@ -0,0 +1,27 @@ +--- +# MacStadium has no dedicated Consul Cluster +bootstrap__consul_data_center: 'he-eu-hel1' + +# Lowered to avoid hitting open files limit at boot. +# https://github.com/status-im/nimbus-eth2/issues/2984 +beacon_node_max_peers: 200 + +# Execution layer Enginer API +macos_exec_layer_urls: + 0: ['http://goerli-02.ih-eu-mda1.nimbus.geth.wg:8552'] + 1: ['http://goerli-02.ih-eu-mda1.nimbus.geth.wg:8553'] +beacon_node_exec_layer_urls: '{{ macos_exec_layer_urls[idx] }}' +beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}' + +# ERA Files Generation +nimbus_era_files_timer_enabled: true +nimbus_era_files_timer_frequency: 604800 +nimbus_era_files_timer_path: '/Users/nimbus/era' +nimbus_era_files_db_path: '/Users/nimbus/beacon-node-{{ beacon_node_network }}-stable/data/db' +nimbus_era_files_nclidb_path: '/Users/nimbus/beacon-node-{{ beacon_node_network }}-unstable/repo/build/ncli_db' + +# Periodic resync to save space +beacon_node_resync_enabled: true +beacon_node_resync_timer_enabled: true +beacon_node_resync_timer_frequency: '2592000' # monthly +beacon_node_resync_timer_trusted_api_url: 'http://linux-01.he-eu-hel1.nimbus.prater.wg:9300/' diff --git a/ansible/inventory/test b/ansible/inventory/test index 4b0a57f0..167f6a4a 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -18,6 +18,7 @@ linux-05.ih-eu-mda1.nimbus.prater hostname=linux-05.ih-eu-mda1.nimbus.prater ans linux-06.ih-eu-mda1.nimbus.mainnet hostname=linux-06.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.101 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-06.ih-eu-mda1.nimbus.mainnet.statusim.net linux-06.ih-eu-mda1.nimbus.prater hostname=linux-06.ih-eu-mda1.nimbus.prater ansible_host=194.33.40.233 env=nimbus stage=prater data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-06.ih-eu-mda1.nimbus.prater.statusim.net linux-07.ih-eu-mda1.nimbus.mainnet hostname=linux-07.ih-eu-mda1.nimbus.mainnet ansible_host=185.181.229.82 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-07.ih-eu-mda1.nimbus.mainnet.statusim.net +macm1-01.ih-eu-mda1.nimbus.prater hostname=macm1-01.ih-eu-mda1.nimbus.prater ansible_host=185.181.230.76 env=nimbus stage=prater data_center=ih-eu-mda1 region=eu-mda1 dns_entry=macm1-01.ih-eu-mda1.nimbus.prater.statusim.net macos-01.ms-eu-dublin.nimbus.prater hostname=macos-01.ms-eu-dublin.nimbus.prater ansible_host=207.254.102.98 env=nimbus stage=prater data_center=ms-eu-dublin region=eu-dublin dns_entry=macos-01.ms-eu-dublin.nimbus.prater.statusim.net mainnet-01.aws-eu-central-1a.nimbus.geth hostname=mainnet-01.aws-eu-central-1a.nimbus.geth ansible_host=18.196.208.138 env=nimbus stage=geth data_center=aws-eu-central-1a region=eu-central-1a dns_entry=mainnet-01.aws-eu-central-1a.nimbus.geth.statusim.net metal-01.ih-eu-mda1.nimbus.eth1 hostname=metal-01.ih-eu-mda1.nimbus.eth1 ansible_host=194.33.40.237 env=nimbus stage=eth1 data_center=ih-eu-mda1 region=eu-mda1 dns_entry=metal-01.ih-eu-mda1.nimbus.eth1.statusim.net @@ -71,6 +72,7 @@ linux-05.ih-eu-mda1.nimbus.prater linux-06.ih-eu-mda1.nimbus.mainnet linux-06.ih-eu-mda1.nimbus.prater linux-07.ih-eu-mda1.nimbus.mainnet +macm1-01.ih-eu-mda1.nimbus.prater metal-01.ih-eu-mda1.nimbus.eth1 metal-01.ih-eu-mda1.nimbus.fluffy metal-02.ih-eu-mda1.nimbus.fluffy @@ -116,6 +118,7 @@ stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet [nimbus-prater-macos] +macm1-01.ih-eu-mda1.nimbus.prater macos-01.ms-eu-dublin.nimbus.prater [nimbus-prater-metal] @@ -173,6 +176,7 @@ linux-03.ih-eu-mda1.nimbus.prater linux-04.ih-eu-mda1.nimbus.prater linux-05.ih-eu-mda1.nimbus.prater linux-06.ih-eu-mda1.nimbus.prater +macm1-01.ih-eu-mda1.nimbus.prater macos-01.ms-eu-dublin.nimbus.prater stable-large-01.aws-eu-central-1a.nimbus.prater testing-large-01.aws-eu-central-1a.nimbus.prater diff --git a/outputs.tf b/outputs.tf index ed937388..ccfeeb0e 100644 --- a/outputs.tf +++ b/outputs.tf @@ -15,6 +15,7 @@ output "hosts" { module.nimbus_nodes_prater_windows_hetzner.hosts, module.nimbus_nodes_prater_windows_innova.hosts, module.nimbus_nodes_prater_macos.hosts, + module.nimbus_nodes_prater_macm1_innova.hosts, module.nimbus_nodes_sepolia_innova.hosts, ) } diff --git a/prater.tf b/prater.tf index 12a8a8a3..f09eb911 100644 --- a/prater.tf +++ b/prater.tf @@ -188,5 +188,23 @@ module "nimbus_nodes_prater_macos" { prefix = "ms" domain = var.domain - ips = ["207.254.102.98"] + ips = [ + "207.254.102.98" # macos-01.ms-eu-dublin.nimbus.prater + ] +} + +module "nimbus_nodes_prater_macm1_innova" { + source = "github.com/status-im/infra-tf-dummy-module" + + name = "macm1" + env = "nimbus" + stage = "prater" + group = "nimbus-prater-macos" + region = "eu-mda1" + prefix = "ih" + domain = var.domain + + ips = [ + "185.181.230.76" # macm1-01.ih-eu-mda1.nimbus.prater + ] }