status-im
/
infra-nimbus
mirror of https://github.com/status-im/infra-nimbus.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

mainnet: rename nel fleet to nec and return nimbus-eth1 service name

This commit is contained in:
Anton Iakimov 2024-11-01 16:27:59 +01:00
parent 89c042cf06
commit 6b1327dd64
No known key found for this signature in database
14 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -21,7 +21,7 @@ There are also archives of ERA files:
| Endpoint | Host |
|-----------------------------------|---------------------------------------|
| https://mainnet.era.nimbus.team/ | `erigon-01.ih-eu-mda1.nimbus.mainnet` |
| https://mainnet.era1.nimbus.team/ | `nel-01.ih-eu-mda1.nimbus.mainnet` |
| https://mainnet.era1.nimbus.team/ | `nec-01.ih-eu-mda1.nimbus.mainnet` |
| https://sepolia.era.nimbus.team/ | `linux-01.ih-eu-mda1.nimbus.sepolia` |
| https://sepolia.era1.nimbus.team/ | `linux-01.ih-eu-mda1.nimbus.sepolia` |
| https://holesky.era.nimbus.team/ | `geth-01.ih-eu-mda1.nimbus.holesky` |

2
ansible/era.yml
View File

@ -13,7 +13,7 @@
become: true
hosts:
- erigon-01.ih-eu-mda1.nimbus.mainnet
- nel-01.ih-eu-mda1.nimbus.mainnet
- nec-01.ih-eu-mda1.nimbus.mainnet
- linux-01.ih-eu-mda1.nimbus.sepolia
- geth-01.ih-eu-mda1.nimbus.holesky
roles:

2
ansible/group_vars/nimbus.mainnet.yml
View File

@ -62,7 +62,7 @@ erigon_authrpc_jwtsecret: '{{ beacon_node_exec_layer_jwt_secret }}'
# Nimbus ETH1 ------------------------------------------------------------------
nimbus_eth1_service_name: 'nel-{{ geth_network_name }}-{{ node.branch | mandatory }}'
nimbus_eth1_service_name: 'nimbus-eth1-{{ geth_network_name }}-{{ node.branch | mandatory }}'
nimbus_eth1_repo_branch: 'master'
nimbus_eth1_network: 'mainnet'
nimbus_eth1_max_peers: 160

0
ansible/host_vars/nel-01.ih-eu-mda1.nimbus.mainnet.yml → ansible/host_vars/nec-01.ih-eu-mda1.nimbus.mainnet.yml
View File

26
ansible/inventory/test
View File

@ -37,9 +37,9 @@ mainnet-01.aws-eu-central-1a.nimbus.geth ansible_host=18.196.208.138 data_center
metal-01.ih-eu-mda1.nimbus.eth1 ansible_host=194.33.40.237 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=metal-01.ih-eu-mda1.nimbus.eth1.status.im env=nimbus region=eu-mda1 stage=eth1
metal-01.ih-eu-mda1.nimbus.fluffy ansible_host=194.33.40.238 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=metal-01.ih-eu-mda1.nimbus.fluffy.status.im env=nimbus region=eu-mda1 stage=fluffy
metal-02.ih-eu-mda1.nimbus.fluffy ansible_host=194.33.40.239 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=metal-02.ih-eu-mda1.nimbus.fluffy.status.im env=nimbus region=eu-mda1 stage=fluffy
nel-01.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.70 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nel-01.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
nel-02.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.72 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nel-02.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
nel-03.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.78 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nel-03.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
nec-01.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.70 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nec-01.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
nec-02.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.72 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nec-02.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
nec-03.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.78 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=nec-03.ih-eu-mda1.nimbus.mainnet.status.im env=nimbus region=eu-mda1 stage=mainnet
neth-01.ih-eu-mda1.nimbus.holesky ansible_host=194.33.40.247 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=neth-01.ih-eu-mda1.nimbus.holesky.status.im env=nimbus region=eu-mda1 stage=holesky
neth-02.ih-eu-mda1.nimbus.holesky ansible_host=194.33.40.248 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=neth-02.ih-eu-mda1.nimbus.holesky.status.im env=nimbus region=eu-mda1 stage=holesky
neth-03.ih-eu-mda1.nimbus.holesky ansible_host=194.33.40.249 data_center=ih-eu-mda1 dns_domain=status.im dns_entry=neth-03.ih-eu-mda1.nimbus.holesky.status.im env=nimbus region=eu-mda1 stage=holesky
@ -104,9 +104,9 @@ macm2-01.ih-eu-mda1.nimbus.holesky
metal-01.ih-eu-mda1.nimbus.eth1
metal-01.ih-eu-mda1.nimbus.fluffy
metal-02.ih-eu-mda1.nimbus.fluffy
nel-01.ih-eu-mda1.nimbus.mainnet
nel-02.ih-eu-mda1.nimbus.mainnet
nel-03.ih-eu-mda1.nimbus.mainnet
nec-01.ih-eu-mda1.nimbus.mainnet
nec-02.ih-eu-mda1.nimbus.mainnet
nec-03.ih-eu-mda1.nimbus.mainnet
neth-01.ih-eu-mda1.nimbus.holesky
neth-02.ih-eu-mda1.nimbus.holesky
neth-03.ih-eu-mda1.nimbus.holesky
@ -195,10 +195,10 @@ erigon-02.ih-eu-mda1.nimbus.mainnet
geth-01.ih-eu-mda1.nimbus.mainnet
geth-02.ih-eu-mda1.nimbus.mainnet
[nimbus-mainnet-nel]
nel-01.ih-eu-mda1.nimbus.mainnet
nel-02.ih-eu-mda1.nimbus.mainnet
nel-03.ih-eu-mda1.nimbus.mainnet
[nimbus-mainnet-nec]
nec-01.ih-eu-mda1.nimbus.mainnet
nec-02.ih-eu-mda1.nimbus.mainnet
nec-03.ih-eu-mda1.nimbus.mainnet
[nimbus-mainnet-small]
bootstrap-01.aws-eu-central-1a.nimbus.mainnet
@ -262,9 +262,9 @@ erigon-01.ih-eu-mda1.nimbus.mainnet
erigon-02.ih-eu-mda1.nimbus.mainnet
geth-01.ih-eu-mda1.nimbus.mainnet
geth-02.ih-eu-mda1.nimbus.mainnet
nel-01.ih-eu-mda1.nimbus.mainnet
nel-02.ih-eu-mda1.nimbus.mainnet
nel-03.ih-eu-mda1.nimbus.mainnet
nec-01.ih-eu-mda1.nimbus.mainnet
nec-02.ih-eu-mda1.nimbus.mainnet
nec-03.ih-eu-mda1.nimbus.mainnet
[nimbus.sepolia]
linux-01.ih-eu-mda1.nimbus.sepolia

6
ansible/mainnet.yml
View File

@ -38,7 +38,7 @@
hosts:
- nimbus-mainnet-geth
- nimbus-mainnet-erigon
- nimbus-mainnet-nel
- nimbus-mainnet-nec
vars_files: layout/mainnet.yml
vars:
# FIXME: Use all Geth nodes available in the fleet until we resync.
@ -109,7 +109,7 @@
- name: Deploy Mainnet Nimbus ETH1 Nodes
become: true
serial: '{{ serial|default(1) }}'
hosts: nimbus-mainnet-nel
hosts: nimbus-mainnet-nec
vars_files: layout/mainnet.yml
tasks:
- include_role:
@ -119,6 +119,6 @@
tags: [ nimbus-eth1 ]
when:
- "'el' in node"
- node.el == "nel"
- node.el == "nec"
with_items: '{{ nodes_layout[inventory_hostname] }}'
loop_control: { loop_var: node, index_var: idx }

0
ansible/vars/addresses/nel-01.ih-eu-mda1.nimbus.mainnet.yml → ansible/vars/addresses/nec-01.ih-eu-mda1.nimbus.mainnet.yml
View File

0
ansible/vars/addresses/nel-02.ih-eu-mda1.nimbus.mainnet.yml → ansible/vars/addresses/nec-02.ih-eu-mda1.nimbus.mainnet.yml
View File

0
ansible/vars/addresses/nel-03.ih-eu-mda1.nimbus.mainnet.yml → ansible/vars/addresses/nec-03.ih-eu-mda1.nimbus.mainnet.yml
View File

2
ansible/vars/addresses/update.sh
View File

@ -16,7 +16,7 @@ function update_yaml() {
for FILE in geth-*.holesky.yml; do update_yaml "${FILE}"; done
for FILE in erigon-*.holesky.yml; do update_yaml "${FILE}"; done
for FILE in neth-*.holesky.yml; do update_yaml "${FILE}"; done
for FILE in nel-*.mainnet.yml; do update_yaml "${FILE}"; done
for FILE in nec-*.mainnet.yml; do update_yaml "${FILE}"; done
for FILE in erigon-*.mainnet.yml; do update_yaml "${FILE}"; done
for FILE in geth-*.mainnet.yml; do update_yaml "${FILE}"; done
for FILE in linux-*.sepolia.yml; do update_yaml "${FILE}"; done

18
ansible/vars/layout/mainnet.yml
View File

@ -9,22 +9,22 @@ nodes_layout:
- { branch: 'stable', history: 'archive' }
# Innova Hosting ---------------------------------------------------
'nel-01.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nel' }
'nec-01.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nec' }
- { branch: 'testing' }
- { branch: 'unstable', el: 'nel' }
- { branch: 'unstable', el: 'nec' }
- { branch: 'libp2p' }
'nel-02.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nel' }
'nec-02.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nec' }
- { branch: 'testing', }
- { branch: 'unstable', el: 'nel' }
- { branch: 'unstable', el: 'nec' }
- { branch: 'libp2p' }
'nel-03.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nel' }
'nec-03.ih-eu-mda1.nimbus.mainnet':
- { branch: 'stable', el: 'nec' }
- { branch: 'testing' }
- { branch: 'unstable', el: 'nel' }
- { branch: 'unstable', el: 'nec' }
- { branch: 'libp2p' }
'erigon-01.ih-eu-mda1.nimbus.mainnet':

2
era.tf
View File

@ -37,7 +37,7 @@ resource "cloudflare_record" "era1_sepolia" {
resource "cloudflare_record" "era1_mainnet" {
zone_id = local.zones["nimbus.team"]
name = "mainnet.era1"
value = module.nimbus_nodes_mainnet_innova_nel.public_ips[0]
value = module.nimbus_nodes_mainnet_innova_nec.public_ips[0]
type = "A"
proxied = true
}

12
mainnet.tf
View File

@ -2,20 +2,20 @@
* CPU: Intel Xeon E5-2690 v2 @ 3.00GHz
* MEM: 62 GB DDR3
* SSD: 1x400 GB, 2x1.6 TB */
module "nimbus_nodes_mainnet_innova_nel" {
module "nimbus_nodes_mainnet_innova_nec" {
source = "github.com/status-im/infra-tf-dummy-module"
name = "nel"
name = "nec"
env = "nimbus"
stage = "mainnet"
group = "nimbus-mainnet-nel"
group = "nimbus-mainnet-nec"
region = "eu-mda1"
prefix = "ih"
ips = [
"194.33.40.70", /* nel-01.ih-eu-mda1.nimbus.mainnet */
"194.33.40.72", /* nel-02.ih-eu-mda1.nimbus.mainnet */
"194.33.40.78", /* nel-03.ih-eu-mda1.nimbus.mainnet */
"194.33.40.70", /* nec-01.ih-eu-mda1.nimbus.mainnet */
"194.33.40.72", /* nec-02.ih-eu-mda1.nimbus.mainnet */
"194.33.40.78", /* nec-03.ih-eu-mda1.nimbus.mainnet */
]
}

2
outputs.tf
View File

@ -12,7 +12,7 @@ output "hosts" {
module.nimbus_nodes_holesky_innova_neth.hosts,
module.nimbus_nodes_holesky_innova_macm2.hosts,
module.nimbus_nodes_holesky_innova_windows.hosts,
module.nimbus_nodes_mainnet_innova_nel.hosts,
module.nimbus_nodes_mainnet_innova_nec.hosts,
module.nimbus_nodes_mainnet_innova_erigon.hosts,
module.nimbus_nodes_mainnet_innova_geth.hosts,
module.nimbus_nodes_mainnet_stable_small.hosts,