diff --git a/ansible/era.yml b/ansible/era.yml index 41899b1..18b9023 100644 --- a/ansible/era.yml +++ b/ansible/era.yml @@ -20,9 +20,6 @@ open_ports_default_chain: 'SERVICES' open_ports_list: [ { port: 80 }, { port: 443 } ] roles: - - role: open-ports - tags: open-ports - - role: origin-certs - tags: origin-certs - - role: nginx - tags: nginx + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-origin-certs, tags: origin-certs } + - { role: infra-role-nginx, tags: nginx } diff --git a/ansible/eth1.yml b/ansible/eth1.yml index 7ff2532..a92a553 100644 --- a/ansible/eth1.yml +++ b/ansible/eth1.yml @@ -15,4 +15,4 @@ - nimbus-eth1-metal roles: - { role: infra-role-nimbus-eth1, tags: nimbus-eth1 } - - { role: infra-role-rocketpool, tags: rocketpool } + - { role: infra-role-rocketpool, tags: rocketpool } diff --git a/ansible/fluffy.yml b/ansible/fluffy.yml index 36d2710..acd6179 100644 --- a/ansible/fluffy.yml +++ b/ansible/fluffy.yml @@ -14,8 +14,8 @@ hosts: - nimbus.fluffy roles: - - { role: open-ports, tags: open-ports } - - { role: smart-metrics, tags: smart-metrics } + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-smart-metrics, tags: smart-metrics } tasks: - include_role: name=infra-role-nimbus-fluffy tags: [ beacon-node, infra-role-nimbus-fluffy ] diff --git a/ansible/geth.yml b/ansible/geth.yml index b2a86e4..239471c 100644 --- a/ansible/geth.yml +++ b/ansible/geth.yml @@ -14,8 +14,8 @@ hosts: - nimbus-geth-mainnet roles: - - { role: open-ports, tags: open-ports } - - { role: smart-metrics, tags: smart-metrics } + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-smart-metrics, tags: smart-metrics } - { role: infra-role-geth, tags: infra-role-geth } - { role: infra-role-geth-exporter, tags: infra-role-geth-exporter } @@ -25,8 +25,8 @@ hosts: - nimbus-geth-goerli roles: - - { role: open-ports, tags: open-ports } - - { role: smart-metrics, tags: smart-metrics } + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-smart-metrics, tags: smart-metrics } tasks: - include_role: name=infra-role-geth tags: [ geth, infra-role-geth ] diff --git a/ansible/logs.yml b/ansible/logs.yml index 9bd10e7..be4884c 100644 --- a/ansible/logs.yml +++ b/ansible/logs.yml @@ -13,12 +13,9 @@ become: true hosts: logs.nimbus roles: - - role: swap-file - tags: swap-file - - role: open-ports - tags: open-ports - - role: elasticsearch - tags: elasticsearch + - { role: infra-role-swap-file, tags: swap-file } + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-elasticsearch, tags: elasticsearch } - name: Configure ElasticSearch servers become: true @@ -42,15 +39,9 @@ port: to_string(ServiceMeta.cluster_port) }') }} roles: - - role: swap-file - tags: swap-file - - role: open-ports - tags: open-ports - - role: elasticsearch-lb - tags: elasticsearch-lb - - role: logclean-job - tags: logclean-job - - role: kibana - tags: kibana - - role: oauth-proxy - tags: oauth-proxy + - { role: infra-role-swap-file, tags: swap-file } + - { role: infra-role-open-ports, tags: open-ports } + - { role: infra-role-elasticsearch-lb, tags: elasticsearch-lb } + - { role: infra-role-logclean-job, tags: logclean-job } + - { role: infra-role-kibana, tags: kibana } + - { role: infra-role-oauth-proxy, tags: oauth-proxy } diff --git a/ansible/mainnet.yml b/ansible/mainnet.yml index 07eed55..aaae5ea 100644 --- a/ansible/mainnet.yml +++ b/ansible/mainnet.yml @@ -18,8 +18,8 @@ # WARNING: Since these are Eth 2 bootnodes we need to keep the keys and IPs unchanged. beacon_node_netkey: '{{lookup("bitwarden", "nimbus/netkey", field=hostname)}}' roles: - - { role: swap-file, tags: [ swap-file ] } - - { role: redirect-ports, tags: [ redirect-ports ] } + - { role: infra-role-swap-file, tags: [ swap-file ] } + - { role: infra-role-redirect-ports, tags: [ redirect-ports ] } - { role: get-geth-api-urls, tags: [ get-geth-api-urls ] } tasks: - include_role: name=infra-role-beacon-node-linux @@ -37,9 +37,9 @@ # FIXME: Use all Geth nodes available in the fleet until we resync. geth_node_api_fleet_names: ['nimbus.geth'] roles: - - { role: swap-file, tags: [ swap-file ] } - - { role: open-ports, tags: [ open-ports ] } - - { role: smart-metrics, tags: [ smart-metrics ] } + - { role: infra-role-swap-file, tags: [ swap-file ] } + - { role: infra-role-open-ports, tags: [ open-ports ] } + - { role: infra-role-smart-metrics, tags: [ smart-metrics ] } - { role: redirect-ports, tags: [ redirect-ports ] } - { role: infra-role-geth, tags: [ infra-role-geth ] } - { role: infra-role-geth-exporter, tags: [ infra-role-geth-exporter ] } diff --git a/ansible/prater.yml b/ansible/prater.yml index 914e5d1..195fa2e 100644 --- a/ansible/prater.yml +++ b/ansible/prater.yml @@ -15,11 +15,11 @@ vars_files: layout/prater.yml hosts: nimbus-prater-metal roles: - - { role: swap-file, tags: [ swap-file ] } - - { role: open-ports, tags: [ open-ports ] } - - { role: smart-metrics, tags: [ smart-metrics ] } - - { role: redirect-ports, tags: [ redirect-ports ] } - - { role: nimbus-era-files, tags: [ nimbus-era-files ] } + - { role: infra-role-swap-file, tags: [ swap-file ] } + - { role: infra-role-open-ports, tags: [ open-ports ] } + - { role: infra-role-smart-metrics, tags: [ smart-metrics ] } + - { role: redirect-ports, tags: [ redirect-ports ] } + - { role: nimbus-era-files, tags: [ nimbus-era-files ] } tasks: - include_role: name=infra-role-nethermind with_items: '{{ nodes_layout[hostname] }}' diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 11ce5ba..9b2e022 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -15,37 +15,37 @@ src: git@github.com:status-im/infra-role-wireguard.git scm: git -- name: open-ports +- name: infra-role-open-ports src: git@github.com:status-im/infra-role-open-ports.git scm: git -- name: swap-file +- name: infra-role-swap-file src: git@github.com:status-im/infra-role-swap-file.git scm: git -- name: nginx +- name: infra-role-nginx src: git@github.com:status-im/infra-role-nginx.git version: 3043c998cbc92a634a71dc48363b3e2525696d26 scm: git -- name: origin-certs +- name: infra-role-origin-certs src: git@github.com:status-im/infra-role-origin-certs.git version: f2b061da8976444d6576b755578f0e799cde4372 scm: git -- name: oauth-proxy +- name: infra-role-oauth-proxy src: git@github.com:status-im/infra-role-oauth-proxy.git - version: f407d2533495a18c17bbba77d7703c063dbfd9be + version: 64ee6a0d397d0d4ec89f87880a2ff1fc80a75a12 scm: git -- name: consul-service +- name: infra-role-consul-service src: git@github.com:status-im/infra-role-consul-service.git version: 4d7c9c606f5e039a22c34ba93961d05056c0e002 scm: git - name: infra-role-beacon-node-linux src: git@github.com:status-im/infra-role-beacon-node-linux.git - version: 3642b4b5ca13b0a637670c870df1d312e8ff5d99 + version: 168fe7b817cc19344bab803eed74bb9a478d65eb scm: git - name: infra-role-beacon-node-windows @@ -60,17 +60,17 @@ - name: infra-role-validator-client src: git@github.com:status-im/infra-role-validator-client.git - version: 0e266971001ece53498ca7c311d32033c2c5cf8f + version: 87f6be288c96d2b956b6650b44f4e9dfa6ff2d2b scm: git - name: infra-role-nimbus-eth1 src: git@github.com:status-im/infra-role-nimbus-eth1.git - version: f9ed9de88388285fb307bba98ba88e61d52c3e8e + version: f4dfbb31eea9a1fa1fed575749723f9576844c84 scm: git - name: infra-role-nimbus-fluffy src: git@github.com:status-im/infra-role-nimbus-fluffy.git - version: cedddac737b5371c2ca34f5f0256ec1d51126541 + version: c231a4320d3367c52c5d610ef6aa5e65d04f0967 scm: git - name: infra-role-dist-validators @@ -80,7 +80,7 @@ - name: infra-role-rocketpool src: git@github.com:status-im/infra-role-rocketpool.git - version: 2a612d049b8950ceb438e1a389f61b5bd7593876 + version: 040ad4024ebb811f92bced2cf8aac24cbebd94f5 scm: git - name: infra-role-winsw @@ -88,52 +88,52 @@ version: 2f89ee1ffac7d678ed25b63a718b1018e1ec860f scm: git -- name: kibana +- name: infra-role-kibana src: git@github.com:status-im/infra-role-kibana.git - version: 88053a6c6e0f2a2fffe6dea3c6cfed0b7c2e3bcf + version: ccc1c3a41d2ea2f125db9a3418e447958c72bfce scm: git -- name: elasticsearch +- name: infra-role-elasticsearch src: git@github.com:status-im/infra-role-elasticsearch.git - version: 7ec1d25604800e0b5b3172d08e938bef564a2c22 + version: 1e86928b7848ab5520ead99a5f1432770af4fc22 scm: git -- name: elasticsearch-lb +- name: infra-role-elasticsearch-lb src: git@github.com:status-im/infra-role-elasticsearch-lb.git - version: 02c71d83adca1161642beebf32a9b43a692079d9 + version: 5ff5e5d526e38a7faf1ff7dfb809c6b6e5bdc17a scm: git -- name: systemd-timer +- name: infra-role-systemd-timer src: git@github.com:status-im/infra-role-systemd-timer.git - version: dcccd43bc1188b3f45e17dacbd49d2661cf703b1 + version: c234a524c00d6edd391b36ba11bb20241b8cdb23 scm: git -- name: launchd-timer +- name: infra-role-launchd-timer src: git@github.com:status-im/infra-role-launchd-timer.git version: 791174a9de57ffbbb4d60cdde05d74a66415f1bd scm: git - name: infra-role-geth src: git@github.com:status-im/infra-role-geth.git - version: bd372f0a580dada68437620221590460a0db67c0 + version: 4246befafdf1c4c4dcbe3b68c5e90ddb2c808d0f scm: git - name: infra-role-geth-exporter src: git@github.com:status-im/infra-role-geth-exporter.git - version: 21770167cdeb5c481066547b6d0814f1ba8546c1 + version: c129dc06a407b153371c1467e5293b7ebaca04ab scm: git - name: infra-role-erigon src: git@github.com:status-im/infra-role-erigon.git - version: b8b1a1c181f3a77021e131212f2c6e8c2e25dd84 + version: 0dbe11237dd04d6c4dcababd7edbcdebf96f416a scm: git - name: infra-role-nethermind src: git@github.com:status-im/infra-role-nethermind.git - version: 456b0230ad3f4baeda295e628c51f158cbeb6d5c + version: c524f170c79905625f5903e87294e9ce07372830 scm: git -- name: smart-metrics +- name: infra-role-smart-metrics src: git@github.com:status-im/infra-role-smart-metrics.git version: c7de707932b878cc4ad22cd69b78203e57dd50fd scm: git diff --git a/ansible/roles/network-debug-script/tasks/main.yml b/ansible/roles/network-debug-script/tasks/main.yml index 5e7c660..77a2cf9 100644 --- a/ansible/roles/network-debug-script/tasks/main.yml +++ b/ansible/roles/network-debug-script/tasks/main.yml @@ -11,7 +11,7 @@ mode: 0755 - name: Set systemd timer for debug script - include_role: name=systemd-timer + include_role: name=infra-role-systemd-timer vars: systemd_timer_name: 'network-debug-script' systemd_timer_description: 'Network Debug Script' diff --git a/ansible/roles/nimbus-era-files/tasks/darwin.yml b/ansible/roles/nimbus-era-files/tasks/darwin.yml index e51f5dc..5f1e143 100644 --- a/ansible/roles/nimbus-era-files/tasks/darwin.yml +++ b/ansible/roles/nimbus-era-files/tasks/darwin.yml @@ -1,6 +1,6 @@ --- - name: Create timer for ERA file updates - include_role: name=launchd-timer + include_role: name=infra-role-launchd-timer vars: launchd_timer_description: 'Update Nimbus beacon node ERA files' launchd_timer_start_on_creation: false @@ -16,7 +16,7 @@ --network={{ nimbus_era_files_network }} exportEra --db={{ nimbus_era_files_db_path }} - name: Create timer for ERA file verification - include_role: name=launchd-timer + include_role: name=infra-role-launchd-timer vars: launchd_timer_description: 'Verify Nimbus beacon node ERA files' launchd_timer_start_on_creation: false diff --git a/ansible/roles/nimbus-era-files/tasks/linux.yml b/ansible/roles/nimbus-era-files/tasks/linux.yml index 0f263f0..af5bc60 100644 --- a/ansible/roles/nimbus-era-files/tasks/linux.yml +++ b/ansible/roles/nimbus-era-files/tasks/linux.yml @@ -1,6 +1,6 @@ --- - name: Create timer for ERA file updates - include_role: name=systemd-timer + include_role: name=infra-role-systemd-timer vars: systemd_timer_description: 'Update Nimbus beacon node ERA files' systemd_timer_start_on_creation: false @@ -18,7 +18,7 @@ --network={{ nimbus_era_files_network }} exportEra --db={{ nimbus_era_files_db_path }} - name: Create timer for ERA file verification - include_role: name=systemd-timer + include_role: name=infra-role-systemd-timer vars: systemd_timer_description: 'Verify Nimbus beacon node ERA files' systemd_timer_start_on_creation: false diff --git a/ansible/roles/nimbus-stats/tasks/main.yml b/ansible/roles/nimbus-stats/tasks/main.yml index a4cbcb6..66cdab8 100644 --- a/ansible/roles/nimbus-stats/tasks/main.yml +++ b/ansible/roles/nimbus-stats/tasks/main.yml @@ -62,7 +62,7 @@ - Save iptables rules - name: Set systemd timer - include_role: name=systemd-timer + include_role: name=infra-role-systemd-timer vars: systemd_timer_name: '{{ nimbus_stats_service_name }}' systemd_timer_description: 'Generates stats for Nimbus cluster.' diff --git a/ansible/sepolia.yml b/ansible/sepolia.yml index fe175c5..070072b 100644 --- a/ansible/sepolia.yml +++ b/ansible/sepolia.yml @@ -16,10 +16,10 @@ hosts: - nimbus-sepolia-linux roles: - - { role: open-ports, tags: [ open-ports ] } - - { role: smart-metrics, tags: [ smart-metrics ] } - - { role: redirect-ports, tags: [ redirect-ports ] } - - { role: nimbus-era-files, tags: [ nimbus-era-files ] } + - { role: infra-role-open-ports, tags: [ open-ports ] } + - { role: infra-role-smart-metrics, tags: [ smart-metrics ] } + - { role: redirect-ports, tags: [ redirect-ports ] } + - { role: nimbus-era-files, tags: [ nimbus-era-files ] } tasks: - include_role: name=infra-role-geth with_items: '{{ nodes_layout[hostname] }}'