From 0d5ef90cd2f50b567127324260908416edc453d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Fri, 11 Mar 2022 15:39:37 +0100
Subject: [PATCH] nimbus.kiln: configure beacon nodes without validators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/status-im/infra-nimbus/issues/88

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/group_vars/nimbus.kiln.yml | 34 +++++++++++++++++++++++++-----
 ansible/kiln.yml                   | 11 ++++++++--
 ansible/requirements.yml           |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/ansible/group_vars/nimbus.kiln.yml b/ansible/group_vars/nimbus.kiln.yml
index fe54bef..42ae184 100644
--- a/ansible/group_vars/nimbus.kiln.yml
+++ b/ansible/group_vars/nimbus.kiln.yml
@@ -1,6 +1,6 @@
 ---
 # Go-Ethereum
-geth_service_name: 'geth-kiln-{{ "%02d"|format(idx|int) }}'
+geth_service_name: 'geth-kiln-{{ "%02d"|format(idx|int+1) }}'
 geth_network_id: 1337802
 geth_sync_mode: 'snap'
 geth_log_level_name: info
@@ -25,11 +25,35 @@ geth_bootnodes:
 geth_rcp_api: 'eth,net,web3,personal,admin,engine'
 geth_websocket_api: 'eth,net,web3,personal,admin,engine'
 # Ports
-geth_port: '{{ 30303 + idx|int }}'
-geth_metrics_port: '{{ 6060 + idx|int }}'
+geth_port: '{{ 30303 + idx|int + 1 }}'
+geth_metrics_port: '{{ 6060 + idx|int + 1 }}'
 geth_rpc_enabled: true
 geth_rpc_addr: '0.0.0.0'
-geth_rpc_port: '{{ 8545 + idx|int }}'
+geth_rpc_port: '{{ 8545 + idx|int + 1 }}'
 geth_websocket_enabled: true
 geth_websocket_addr: '0.0.0.0'
-geth_websocket_port: '{{ 9546 + idx|int }}'
+geth_websocket_port: '{{ 9546 + idx|int + 1 }}'
+
+# Beacon Nodes
+beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-devauth-{{ "%02d"|format(idx|int+1) }}'
+  # WARNING: This is a manually copied network config folder relative to CWD.
+beacon_node_network: 'kiln'
+beacon_node_repo_branch: 'kiln-dev-auth'
+# Builds
+beacon_node_build_frequency: 'daily'
+# Eth1 Sync
+beacon_node_web3_urls: ['ws://{{ hostname }}.wg:{{ geth_websocket_port }}']
+# Ports
+beacon_node_discovery_port: '{{ 9000 + idx|int + 1 }}'
+beacon_node_listening_port: '{{ 9000 + idx|int + 1 }}'
+beacon_node_metrics_port:   '{{ 9200 + idx|int + 1 }}'
+beacon_node_rest_port:      '{{ 9300 + idx|int + 1 }}'
+beacon_node_rpc_port:       '{{ 9900 + idx|int + 1 }}'
+
+# TODO: Add validator layout.
+nodes_layout:
+  'metal-01.he-eu-hel1.nimbus.kiln':
+    - {}
+    - {}
+    - {}
+    - {}
diff --git a/ansible/kiln.yml b/ansible/kiln.yml
index bb1fa2e..857fd16 100644
--- a/ansible/kiln.yml
+++ b/ansible/kiln.yml
@@ -17,6 +17,13 @@
   tasks:
     - include_role: name=infra-role-geth
       tags: [ geth, infra-role-geth ]
-      with_sequence: start=1 end=4
+      with_items: '{{ nodes_layout[hostname] }}'
       loop_control:
-        loop_var: 'idx'
+        loop_var: node
+        index_var: idx
+    - include_role: name=infra-role-beacon-node-linux
+      tags: [ beacon-node, infra-role-beacon-node-linux ]
+      with_items: '{{ nodes_layout[hostname] }}'
+      loop_control:
+        loop_var: node
+        index_var: idx
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 8be5aa3..bb4dcb8 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -46,7 +46,7 @@
 
 - name: infra-role-beacon-node-linux
   src: git@github.com:status-im/infra-role-beacon-node-linux.git
-  version: 0dc85839fa6379ddb5b0fcc3da7f4ab7d5bb9c81
+  version: 79839d307d22b68d4829552b7a618bcdfb28645b
   scm: git
 
 - name: infra-role-beacon-node-windows