diff --git a/ansible/inventories/devnet-0/group_vars/bootnode.yaml b/ansible/inventories/devnet-0/group_vars/bootnode.yaml index a47a9eb..604cbd7 100644 --- a/ansible/inventories/devnet-0/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-0/group_vars/bootnode.yaml @@ -69,7 +69,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -104,7 +104,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml index c6c0e29..ca1f55e 100644 --- a/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-0/group_vars/ethereum_node.yaml @@ -1,10 +1,10 @@ ethereum_cl_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}" ethereum_el_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}" ethereum_node_xatu_sentry_enabled: true diff --git a/ansible/inventories/devnet-1/group_vars/bootnode.yaml b/ansible/inventories/devnet-1/group_vars/bootnode.yaml index a856289..de730e6 100644 --- a/ansible/inventories/devnet-1/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-1/group_vars/bootnode.yaml @@ -99,7 +99,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -134,7 +134,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-1/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-1/group_vars/ethereum_node.yaml index c6c0e29..ca1f55e 100644 --- a/ansible/inventories/devnet-1/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-1/group_vars/ethereum_node.yaml @@ -1,10 +1,10 @@ ethereum_cl_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}" ethereum_el_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}" ethereum_node_xatu_sentry_enabled: true diff --git a/ansible/inventories/devnet-2/group_vars/bootnode.yaml b/ansible/inventories/devnet-2/group_vars/bootnode.yaml index 8fc4efe..5ce0d90 100644 --- a/ansible/inventories/devnet-2/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-2/group_vars/bootnode.yaml @@ -77,7 +77,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -112,7 +112,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml index b0a5795..409d61c 100644 --- a/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-2/group_vars/ethereum_node.yaml @@ -1,15 +1,15 @@ ethereum_cl_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}" - - "{{ hostvars['hc-lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] }}" - - "{{ hostvars['hc-lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}" + - "{{ hostvars['hc-lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] }}" + - "{{ hostvars['hc-lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_cl_enr'] }}" ethereum_el_bootnodes: - "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}" - - "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}" - - "{{ hostvars['hc-lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] }}" - - "{{ hostvars['hc-lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] }}" + - "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}" + - "{{ hostvars['hc-lighthouse-geth-super-1']['ethereum_node_fact_discovery_el_enode'] }}" + - "{{ hostvars['hc-lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_el_enode'] }}" ethereum_node_xatu_sentry_enabled: true diff --git a/ansible/inventories/devnet-3/group_vars/bootnode.yaml b/ansible/inventories/devnet-3/group_vars/bootnode.yaml index 8f76f4f..1357da5 100644 --- a/ansible/inventories/devnet-3/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-3/group_vars/bootnode.yaml @@ -75,7 +75,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -110,7 +110,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-3/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-3/group_vars/ethereum_node.yaml index ccaf99d..f6ee2e0 100644 --- a/ansible/inventories/devnet-3/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-3/group_vars/ethereum_node.yaml @@ -2,9 +2,9 @@ ethereum_cl_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enr'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] ) | select('string') | list }} @@ -12,9 +12,9 @@ ethereum_el_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enode'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] ) | select('string') | list }} diff --git a/ansible/inventories/devnet-5/group_vars/bootnode.yaml b/ansible/inventories/devnet-5/group_vars/bootnode.yaml index 8f76f4f..1357da5 100644 --- a/ansible/inventories/devnet-5/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-5/group_vars/bootnode.yaml @@ -75,7 +75,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -110,7 +110,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-5/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-5/group_vars/ethereum_node.yaml index ccaf99d..f6ee2e0 100644 --- a/ansible/inventories/devnet-5/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-5/group_vars/ethereum_node.yaml @@ -2,9 +2,9 @@ ethereum_cl_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enr'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] ) | select('string') | list }} @@ -12,9 +12,9 @@ ethereum_el_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enode'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] ) | select('string') | list }} diff --git a/ansible/inventories/devnet-6/group_vars/bootnode.yaml b/ansible/inventories/devnet-6/group_vars/bootnode.yaml index acc5d47..45243a0 100644 --- a/ansible/inventories/devnet-6/group_vars/bootnode.yaml +++ b/ansible/inventories/devnet-6/group_vars/bootnode.yaml @@ -75,7 +75,7 @@ lodestar_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_cl_enr']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_cl_enr']) | select('defined') | list ) @@ -110,7 +110,7 @@ geth_container_command_extra_args: ( ( groups['bootnode'] - | map('extract', hostvars, ['ethereum_node_fact_el_enode']) + | map('extract', hostvars, ['ethereum_node_fact_discovery_el_enode']) | select('defined') | list ) diff --git a/ansible/inventories/devnet-6/group_vars/ethereum_node.yaml b/ansible/inventories/devnet-6/group_vars/ethereum_node.yaml index ccaf99d..f6ee2e0 100644 --- a/ansible/inventories/devnet-6/group_vars/ethereum_node.yaml +++ b/ansible/inventories/devnet-6/group_vars/ethereum_node.yaml @@ -2,9 +2,9 @@ ethereum_cl_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enr'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_cl_enr'] | default(None)] ) | select('string') | list }} @@ -12,9 +12,9 @@ ethereum_el_bootnodes: >- {{ ( [hostvars[primary_bootnode]['bootnodoor_fact_enode'] | default(None)] - + [hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] | default(None)] - + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] | default(None)] + + [hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] + + [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_discovery_el_enode'] | default(None)] ) | select('string') | list }}