ansible: drop tags from include_role tasks

This does not actually work. And what we need is to include a `tags` key
in each of the elements provided via `with_items`. To do this in a way
that's not disgusting we would probably need a custom lookup plugin.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2023-09-08 11:59:50 +02:00
parent f1ec33383a
commit 73c4b72972
No known key found for this signature in database
GPG Key ID: FE65CD384D5BF7B4
3 changed files with 0 additions and 15 deletions

View File

@ -22,7 +22,6 @@
- { role: get-geth-api-urls, tags: [ get-geth-api-urls ] } - { role: get-geth-api-urls, tags: [ get-geth-api-urls ] }
tasks: tasks:
- include_role: name=infra-role-beacon-node-linux - include_role: name=infra-role-beacon-node-linux
tags: [ beacon-node, infra-role-beacon-node-linux ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
@ -43,7 +42,6 @@
- { role: nimbus-era-files, tags: [ nimbus-era-files ] } - { role: nimbus-era-files, tags: [ nimbus-era-files ] }
tasks: tasks:
- include_role: name=infra-role-beacon-node-linux - include_role: name=infra-role-beacon-node-linux
tags: [ beacon-node, infra-role-beacon-node-linux ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node

View File

@ -41,39 +41,33 @@
- { role: nimbus-era-files, tags: [ nimbus-era-files ] } - { role: nimbus-era-files, tags: [ nimbus-era-files ] }
tasks: tasks:
- include_role: name=infra-role-erigon - include_role: name=infra-role-erigon
tags: [ geth, infra-role-erigon ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
when: node.get('erigon', false) when: node.get('erigon', false)
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-nethermind - include_role: name=infra-role-nethermind
tags: [ geth, infra-role-nethermind ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
when: node.get('nethermind', false) when: node.get('nethermind', false)
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-geth - include_role: name=infra-role-geth
tags: [ geth, infra-role-geth ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-geth-exporter - include_role: name=infra-role-geth-exporter
tags: [ geth-exporter, infra-role-geth-exporter ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-beacon-node-linux - include_role: name=infra-role-beacon-node-linux
tags: [ beacon-node, infra-role-beacon-node-linux ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-validator-client - include_role: name=infra-role-validator-client
tags: [ validator-client, infra-role-validator-client ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
when: validator_client_service_enabled when: validator_client_service_enabled
loop_control: loop_control:
@ -111,7 +105,6 @@
- { role: get-geth-api-urls, tags: [ get-geth-api-urls ] } - { role: get-geth-api-urls, tags: [ get-geth-api-urls ] }
tasks: tasks:
- include_role: name=infra-role-beacon-node-windows - include_role: name=infra-role-beacon-node-windows
tags: [ beacon-node, infra-role-beacon-node-windows ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
@ -126,7 +119,6 @@
- { role: nimbus-era-files, tags: [ nimbus-era-files ] } - { role: nimbus-era-files, tags: [ nimbus-era-files ] }
tasks: tasks:
- include_role: name=infra-role-beacon-node-macos - include_role: name=infra-role-beacon-node-macos
tags: [ beacon-node, infra-role-beacon-node-macos ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node

View File

@ -20,21 +20,18 @@
- { role: redirect-ports, tags: [ redirect-ports ] } - { role: redirect-ports, tags: [ redirect-ports ] }
tasks: tasks:
- include_role: name=infra-role-geth - include_role: name=infra-role-geth
tags: [ geth, infra-role-geth ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-beacon-node-linux - include_role: name=infra-role-beacon-node-linux
tags: [ beacon-node, infra-role-beacon-node-linux ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-validator-client - include_role: name=infra-role-validator-client
tags: [ validator-client, infra-role-validator-client ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
@ -51,14 +48,12 @@
include_vars: file=vars/nimbus-sepolia-trial.yml include_vars: file=vars/nimbus-sepolia-trial.yml
- include_role: name=infra-role-nimbus-eth1 - include_role: name=infra-role-nimbus-eth1
tags: [ nimbus-eth1, infra-role-nimbus-eth1 ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node
index_var: idx index_var: idx
- include_role: name=infra-role-beacon-node-linux - include_role: name=infra-role-beacon-node-linux
tags: [ beacon-node, infra-role-beacon-node-linux ]
with_items: '{{ nodes_layout[hostname] }}' with_items: '{{ nodes_layout[hostname] }}'
loop_control: loop_control:
loop_var: node loop_var: node