diff --git a/ansible/geth.yml b/ansible/geth.yml index 94b445b..1dbd44f 100644 --- a/ansible/geth.yml +++ b/ansible/geth.yml @@ -13,7 +13,6 @@ become: true hosts: - nimbus-geth-goerli - - nimbus-geth-ropsten - nimbus-geth-mainnet roles: - { role: swap-file, tags: swap-file } diff --git a/ansible/group_vars/nimbus-geth-ropsten.yml b/ansible/group_vars/nimbus-geth-ropsten.yml deleted file mode 100644 index 0250b31..0000000 --- a/ansible/group_vars/nimbus-geth-ropsten.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -# Syncing can use a lot of mamory -swap_file_size_mb: 4096 - -# Geth node -geth_service_name: 'nimbus-ropsten' -geth_network_name: 'ropsten' -geth_sync_mode: 'snap' -geth_log_level_name: info -geth_websocket_enabled: true -# Enable engine API -geth_rcp_api: 'eth,net,web3,personal,admin,engine' -geth_websocket_api: 'eth,net,web3,personal,admin,engine' -# Geth auth & JWT token -geth_account_pass: '{{lookup("bitwarden", "nimbus/geth", field="password")}}' -geth_authrpc_jwtsecret: '{{lookup("bitwarden", "nimbus/jwt-token")}}' -# Allow connections from our VPN -geth_websocket_origins: '*' -# Memory settings -geth_cont_mem_ratio: 0.8 -geth_cache_size: '{{ (ansible_memtotal_mb * 0.25|float) | int }}' - -# Geth metrics -geth_expo_service_name: '{{ geth_service_name }}' -geth_expo_source_cont_name: '{{ geth_cont_name }}' -geth_expo_source_data_path: '{{ geth_cont_vol }}/data' - -# Ports -geth_port: 30303 -geth_rpc_addr: '0.0.0.0' -geth_rpc_port: 8545 -geth_authrpc_addr: '0.0.0.0' -geth_authrpc_port: 8551 -geth_websocket_addr: '0.0.0.0' -geth_websocket_port: 8546 -geth_expo_cont_port: 9200 - -# Open Ports -open_ports_default_comment: 'Geth API' -open_ports_default_chain: 'VPN' -open_ports_list: - - { port: '{{ geth_expo_cont_port }}', ipset: 'metrics.hq', comment: 'Geth Metrics' } - - { port: '{{ geth_rpc_port }}', ipset: 'nimbus.ropsten' } - - { port: '{{ geth_authrpc_port }}', ipset: 'nimbus.ropsten' } - - { port: '{{ geth_websocket_port }}', ipset: 'nimbus.ropsten' } diff --git a/ansible/inventory/test b/ansible/inventory/test index 011fdfc..4a0af79 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -23,7 +23,6 @@ metal-05.he-eu-hel1.nimbus.prater hostname=metal-05.he-eu-hel1.nimbus.prater ans metal-06.he-eu-hel1.nimbus.mainnet hostname=metal-06.he-eu-hel1.nimbus.mainnet ansible_host=135.181.56.50 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-06.he-eu-hel1.nimbus.mainnet.statusim.net metal-06.he-eu-hel1.nimbus.prater hostname=metal-06.he-eu-hel1.nimbus.prater ansible_host=65.21.91.59 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-06.he-eu-hel1.nimbus.prater.statusim.net node-01.aws-eu-central-1a.dash.nimbus hostname=node-01.aws-eu-central-1a.dash.nimbus ansible_host=52.28.100.116 env=dash stage=nimbus data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-01.aws-eu-central-1a.dash.nimbus.statusim.net -ropsten-01.aws-eu-central-1a.nimbus.geth hostname=ropsten-01.aws-eu-central-1a.nimbus.geth ansible_host=3.122.147.63 env=nimbus stage=geth data_center=aws-eu-central-1a region=eu-central-1a dns_entry=ropsten-01.aws-eu-central-1a.nimbus.geth.statusim.net stable-large-01.aws-eu-central-1a.nimbus.prater hostname=stable-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.120.202.252 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-large-01.aws-eu-central-1a.nimbus.prater.statusim.net stable-small-01.aws-eu-central-1a.nimbus.mainnet hostname=stable-small-01.aws-eu-central-1a.nimbus.mainnet ansible_host=3.120.104.18 env=nimbus stage=mainnet data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-small-01.aws-eu-central-1a.nimbus.mainnet.statusim.net stable-small-02.aws-eu-central-1a.nimbus.mainnet hostname=stable-small-02.aws-eu-central-1a.nimbus.mainnet ansible_host=3.64.117.223 env=nimbus stage=mainnet data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-small-02.aws-eu-central-1a.nimbus.mainnet.statusim.net @@ -38,7 +37,6 @@ windows-01.he-eu-hel1.nimbus.prater hostname=windows-01.he-eu-hel1.nimbus.prater goerli-01.aws-eu-central-1a.nimbus.geth mainnet-01.aws-eu-central-1a.nimbus.geth node-01.aws-eu-central-1a.dash.nimbus -ropsten-01.aws-eu-central-1a.nimbus.geth stable-large-01.aws-eu-central-1a.nimbus.prater stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet @@ -96,9 +94,6 @@ goerli-01.aws-eu-central-1a.nimbus.geth [nimbus-geth-mainnet] mainnet-01.aws-eu-central-1a.nimbus.geth -[nimbus-geth-ropsten] -ropsten-01.aws-eu-central-1a.nimbus.geth - [nimbus-kiln-metal] metal-01.he-eu-hel1.nimbus.kiln @@ -153,7 +148,6 @@ metal-02.he-eu-hel1.nimbus.fluffy [nimbus.geth] goerli-01.aws-eu-central-1a.nimbus.geth mainnet-01.aws-eu-central-1a.nimbus.geth -ropsten-01.aws-eu-central-1a.nimbus.geth [nimbus.kiln] metal-01.he-eu-hel1.nimbus.kiln diff --git a/geth.tf b/geth.tf index 384bab8..deb4ea9 100644 --- a/geth.tf +++ b/geth.tf @@ -49,29 +49,3 @@ module "nimbus_geth_goerli" { secgroup_id = module.nimbus_network.secgroup.id keypair_name = aws_key_pair.jakubgs.key_name } - -module "nimbus_geth_ropsten" { - source = "github.com/status-im/infra-tf-amazon-web-services" - - name = "ropsten" - env = "nimbus" - stage = "geth" - group = "nimbus-geth-ropsten" - domain = var.domain - - /* Scaling */ - type = "t3a.large" - root_vol_size = 10 - data_vol_size = 250 - data_vol_type = "gp2" - host_count = 1 - - /* Firewall */ - open_tcp_ports = [30303] - - /* Plumbing */ - vpc_id = module.nimbus_network.vpc.id - subnet_id = module.nimbus_network.subnets[0].id - secgroup_id = module.nimbus_network.secgroup.id - keypair_name = aws_key_pair.jakubgs.key_name -} diff --git a/outputs.tf b/outputs.tf index a8acd61..b8397cf 100644 --- a/outputs.tf +++ b/outputs.tf @@ -3,7 +3,6 @@ output "hosts" { module.nimbus_dashboard.hosts, module.nimbus_log_store.hosts, module.nimbus_geth_goerli.hosts, - module.nimbus_geth_ropsten.hosts, module.nimbus_geth_mainnet.hosts, module.nimbus_nodes_mainnet_hetzner.hosts, module.nimbus_nodes_mainnet_stable_small.hosts,