diff --git a/ansible/cleanup_ethereum.yaml b/ansible/cleanup_ethereum.yaml index 074ae48..98d6def 100644 --- a/ansible/cleanup_ethereum.yaml +++ b/ansible/cleanup_ethereum.yaml @@ -35,7 +35,7 @@ - "reth" - "execution" - "execution-init" - - "reth" + - "nimbusel" # Consensus layer clients - "lighthouse-validator" - "lighthouse" @@ -67,6 +67,7 @@ - /data/geth - /data/nethermind - /data/reth + - /data/nimbusel # Consensus layer data - /data/lighthouse - /data/lighthouse-validator diff --git a/ansible/inventories/devnet-0/group_vars/nethermind.yaml b/ansible/inventories/devnet-0/group_vars/nethermind.yaml index 544c489..8fe8431 100644 --- a/ansible/inventories/devnet-0/group_vars/nethermind.yaml +++ b/ansible/inventories/devnet-0/group_vars/nethermind.yaml @@ -32,7 +32,7 @@ nethermind_container_command_extra_args: - --Discovery.Bootnodes={{ ethereum_el_bootnodes | join(',') }} - --Init.IsMining=false - --Pruning.Mode=None - - --config=none.cfg + - --config=none - --EthStats.Enabled=true - --EthStats.Name={{ inventory_hostname }} - --EthStats.Secret={{ ethstats_secret }} diff --git a/ansible/inventories/devnet-0/group_vars/teku.yaml b/ansible/inventories/devnet-0/group_vars/teku.yaml index e769032..d736af4 100644 --- a/ansible/inventories/devnet-0/group_vars/teku.yaml +++ b/ansible/inventories/devnet-0/group_vars/teku.yaml @@ -50,5 +50,4 @@ teku_container_command_extra_args: - --rest-api-docs-enabled teku_validator_container_volumes: - "{{ teku_validator_datadir }}:/validator-data" - - "{{ eth_testnet_config_dir }}:/network-config:ro" teku_validator_datadir: /data/teku-validator diff --git a/terraform/devnet-0/digitalocean.tf b/terraform/devnet-0/digitalocean.tf index fae54f3..dad0a4c 100644 --- a/terraform/devnet-0/digitalocean.tf +++ b/terraform/devnet-0/digitalocean.tf @@ -27,7 +27,7 @@ variable "digitalocean_regions" { } //////////////////////////////////////////////////////////////////////////////////////// -// LOCALS +// LOCALS //////////////////////////////////////////////////////////////////////////////////////// locals { base_cidr_block = var.base_cidr_block @@ -49,7 +49,7 @@ locals { id = "${vm_group.name}-${i + 1}" vms = { "${i + 1}" = { - tags = "group_name:${vm_group.name},val_start:${vm_group.validator_start + (i * (vm_group.validator_end - vm_group.validator_start) / vm_group.count)},val_end:${min(vm_group.validator_start + ((i + 1) * (vm_group.validator_end - vm_group.validator_start) / vm_group.count), vm_group.validator_end)}" + tags = "group_name:${vm_group.name},val_start:${vm_group.validator_start + ceil(i * (vm_group.validator_end - vm_group.validator_start) / vm_group.count)},val_end:${min(vm_group.validator_start + ceil((i + 1) * (vm_group.validator_end - vm_group.validator_start) / vm_group.count), vm_group.validator_end)}" region = element(var.digitalocean_regions, i % length(var.digitalocean_regions)) size = try(vm_group.size, local.digitalocean_default_size) ipv6 = try(vm_group.ipv6, true) @@ -309,7 +309,7 @@ resource "local_file" "ansible_inventory" { ipv6 = try(server.ipv6_address, "none") group = try(split(":", tolist(server.tags)[2])[1], "unknown") validator_start = try(split(":", tolist(server.tags)[4])[1], 0) - validator_end = try(split(":", tolist(server.tags)[3])[1], 0) # if the tag is not a number it will be 0 - e.g no validator keys + validator_end = try(split(":", tolist(server.tags)[3])[1], 0) # if the tag is not a number it will be 0 - e.g no validator keys tags = "${server.tags}" hostname = "${split(".", key)[0]}" cloud = "digitalocean"