Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/inventories/devnet-0/group_vars/all/all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ otelcol_contrib_config: |
format: docker
add_metadata_from_filepath: true
- type: filter
expr: 'attributes["container.name"] != nil and attributes["container.name"] matches "^(otelcol|ethereum-metrics-exporter|nginx-proxy|node_exporter|prometheus|snooper-.*)$"'
expr: '(attributes["container.name"] != nil and attributes["container.name"] matches "^(otelcol|ethereum-metrics-exporter|nginx-proxy|node_exporter|prometheus|snooper-.*)$") or body matches "github\\.com/open-telemetry/opentelemetry-collector-contrib|otelcol-contrib"'
- type: json_parser
if: 'body matches "^\\s*\\{"'
on_error: send
Expand Down
4 changes: 2 additions & 2 deletions ansible/inventories/devnet-0/group_vars/bootnode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ lighthouse_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
)
Expand Down Expand Up @@ -111,7 +111,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
)
Expand Down
12 changes: 6 additions & 6 deletions ansible/inventories/devnet-0/group_vars/ethereum_node.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ethereum_cl_bootnodes:
- "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}"
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars['lighthouse-geth-super-2']['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars['lighthouse-nimbusel-full-1']['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars['lighthouse-nimbusel-full-2']['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}"
- "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_discovery_cl_enr'] }}"
- "{{ hostvars['lighthouse-geth-super-2']['ethereum_node_fact_discovery_cl_enr'] }}"
- "{{ hostvars['lighthouse-nimbusel-full-1']['ethereum_node_fact_discovery_cl_enr'] }}"
- "{{ hostvars['lighthouse-nimbusel-full-2']['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

Expand Down
4 changes: 2 additions & 2 deletions ansible/inventories/devnet-0/host_vars/mev-relay-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ lighthouse_validator_datadir: /data/lighthouse-validator
lighthouse_container_pull: true

ethereum_el_bootnodes:
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}"
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_el_enode'] }}"

ethereum_cl_bootnodes:
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_discovery_cl_enr'] }}"

# role: ethpandaops.general.ethereum_node
ethereum_node_el: reth
Expand Down