From 0970c10b898858fd36d8525093bb425f6bf3ba59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 24 Apr 2024 09:28:36 +0200
Subject: [PATCH] nimbus.holesky: re-add missing playbook steps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/holesky.yml      | 49 +++++++++++++++++++++++++++++++++++++---
 ansible/requirements.yml |  2 +-
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/ansible/holesky.yml b/ansible/holesky.yml
index 44596fd..9d7bd67 100644
--- a/ansible/holesky.yml
+++ b/ansible/holesky.yml
@@ -18,13 +18,56 @@
     - nimbus-holesky-neth
   vars_files: layout/holesky.yml
   roles:
-    - role: update-netplan
-      tags: update-netplan
-      when: ansible_system == 'Linux'
+    - { role: update-netplan,        tags: update-netplan,    when: ansible_system == 'Linux' }
+    - { role: infra-role-swap-file,  tags: [ swap-file ]      }
+    - { role: infra-role-open-ports, tags: [ open-ports ]     }
+    - { role: redirect-ports,        tags: [ redirect-ports ] }
   tasks:
     - include_role: name=infra-role-beacon-node-linux
       with_items: '{{ nodes_layout[hostname] }}'
       loop_control: { loop_var: node, index_var: idx }
+    - include_role: name=infra-role-validator-client
+      with_items: '{{ nodes_layout[hostname] }}'
+      when: validator_client_service_enabled
+      loop_control: { loop_var: node, index_var: idx }
+
+- name: Deploy Holesky Geth Nodes
+  become: true
+  serial: '{{ serial|default(1) }}'
+  hosts: nimbus-holesky-geth
+  vars_files: layout/holesky.yml
+  tasks:
+    - include_role: name=infra-role-geth
+      when: node.el == "geth"
+      with_items: '{{ nodes_layout[hostname] }}'
+      loop_control: { loop_var: node, index_var: idx }
+
+    - include_role: name=infra-role-geth-exporter
+      when: node.el == "geth"
+      with_items: '{{ nodes_layout[hostname] }}'
+      loop_control: { loop_var: node, index_var: idx }
+
+- name: Deploy Holesky Erigon Nodes
+  become: true
+  serial: '{{ serial|default(1) }}'
+  hosts: nimbus-holesky-erigon
+  vars_files: layout/holesky.yml
+  tasks:
+    - include_role: name=infra-role-erigon
+      when: node.el == "erigon"
+      with_items: '{{ nodes_layout[hostname] }}'
+      loop_control: { loop_var: node, index_var: idx }
+
+- name: Deploy Holesky Nethermind Nodes
+  become: true
+  serial: '{{ serial|default(1) }}'
+  hosts: nimbus-holesky-neth
+  vars_files: layout/holesky.yml
+  tasks:
+    - include_role: name=infra-role-nethermind
+      when: node.el == "nethermind"
+      with_items: '{{ nodes_layout[hostname] }}'
+      loop_control: { loop_var: node, index_var: idx }
 
 - name: Deploy Holesky MacOS Beacon Nodes
   become: true
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 6c33f2a..faa9c48 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -45,7 +45,7 @@
 
 - name: infra-role-beacon-node-linux
   src: git@github.com:status-im/infra-role-beacon-node-linux.git
-  version: 91c2fe1afa845fbae87d70bccd09dc098db6dc04
+  version: ed1c7b7f3edab0c2f17f97c92514ddef18c80e5d
   scm: git
 
 - name: infra-role-beacon-node-windows