From 652c7129faf02f48d23855ee5abcff2bc08116b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 5 Nov 2020 13:51:42 +0100
Subject: [PATCH] deploy new layout with Madella nodes on each host
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/group_vars/nimbus-master.yml          | 18 --------
 .../{nimbus-slaves.yml => nimbus.test.yml}    | 13 ++++++
 ansible/nimbus.yml                            | 45 ++++++-------------
 3 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 100644 ansible/group_vars/nimbus-master.yml
 rename ansible/group_vars/{nimbus-slaves.yml => nimbus.test.yml} (57%)

diff --git a/ansible/group_vars/nimbus-master.yml b/ansible/group_vars/nimbus-master.yml
deleted file mode 100644
index 096e888..0000000
--- a/ansible/group_vars/nimbus-master.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# TRACE needs more disk space
-bootstrap__rsyslog_docker_logs_path: '/docker/log'
-# The volume of logs is too big and Nimbus team doesn't use their own cluster
-bootstrap__rsyslog_docker_logstash_send: false
-
-# lower local retention to save space
-bootstrap__logrotate_frequency: 'hourly'
-bootstrap__logrotate_count: 3
-bootstrap__logrotate_mbytes: 200
-
-nimbus_stats_domain: nimbus-test-stats.status.im
-
-beacon_node_log_level: DEBUG
-
-# resource limits
-beacon_node_mem_limit: '{{ (ansible_memtotal_mb * 0.60) | int }}'
-beacon_node_mem_reserve: '{{ (ansible_memtotal_mb * 0.4) | int }}'
diff --git a/ansible/group_vars/nimbus-slaves.yml b/ansible/group_vars/nimbus.test.yml
similarity index 57%
rename from ansible/group_vars/nimbus-slaves.yml
rename to ansible/group_vars/nimbus.test.yml
index 457b1af..ea58891 100644
--- a/ansible/group_vars/nimbus-slaves.yml
+++ b/ansible/group_vars/nimbus.test.yml
@@ -9,7 +9,20 @@ bootstrap__logrotate_frequency: 'hourly'
 bootstrap__logrotate_count: 3
 bootstrap__logrotate_mbytes: 500
 
+# Nimbus ------------------------------
+beacon_node_cont_name: 'beacon-node-{{ beacon_node_network }}-{{ beacon_node_repo_branch }}'
 beacon_node_log_level: DEBUG
+beacon_node_timer_rebuild: true
+
+# entwork
+beacon_node_network: 'testnet3'
+beacon_node_shared_testnet: 'medalla'
+
+# ports
+beacon_node_rpc_port: '11000'
+beacon_node_metrics_port : '9300'
+beacon_node_listening_port: '9100'
+beacon_node_discovery_port: '9100'
 
 # resource limits
 beacon_node_mem_limit: '{{ (ansible_memtotal_mb * 0.60) | int }}'
diff --git a/ansible/nimbus.yml b/ansible/nimbus.yml
index dc3a091..83d3601 100644
--- a/ansible/nimbus.yml
+++ b/ansible/nimbus.yml
@@ -7,45 +7,26 @@
         that: 'ansible_version.full is version_compare("2.8", ">=")'
         msg: 'Your Ansible version is lower than 2.8. Upgrade it.'
 
-- name: Configure Nimbus master
-  hosts:
-    - nimbus-master
-  roles:
-    - { role: origin-certs, tags: [ origin-certs ] }
-    #- { role: nimbus-stats, tags: nimbus-stats }
-
 - name: Configure shared testnet3
-  hosts:
-    - nimbus-master
-    - nimbus-slaves[0:4]
+  hosts: nimbus.test[0:3]
   vars:
-    beacon_node_network: 'testnet3'
-    beacon_node_shared_testnet: 'medalla'
-    beacon_node_rpc_port: '11000'
-    beacon_node_metrics_port : '9300'
-    beacon_node_listening_port: '9100'
-    beacon_node_discovery_port: '9100'
-    beacon_node_cont_name: 'beacon-node-{{ beacon_node_network }}'
-    beacon_node_timer_rebuild: true
-    cont_restart: true
+    beacon_node_repo_branch: 'master'
   roles:
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
     - { role: network-debug-script,   tags: [ network-debug-script ] }
 
-- name: Configure seared testnet2
-  hosts:
-    - nimbus-slaves[5:8]
-  tags: beacon-node
+- name: Configure shared testnet2
+  hosts: nimbus.test[4:7]
   vars:
-    beacon_node_network: 'testnet2'
-    beacon_node_shared_testnet: 'altona'
-    beacon_node_rpc_port: '11000'
-    beacon_node_metrics_port : '9300'
-    beacon_node_listening_port: '9100'
-    beacon_node_discovery_port: '9100'
-    beacon_node_cont_name: 'beacon-node-{{ beacon_node_network }}'
-    beacon_node_timer_rebuild: true
-    cont_restart: true
+    beacon_node_repo_branch: 'develop'
+  roles:
+    - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
+    - { role: network-debug-script,   tags: [ network-debug-script ] }
+
+- name: Configure shared testnet2
+  hosts: nimbus.test[8:9]
+  vars:
+    beacon_node_repo_branch: 'nim-libp2p-auto-bump'
   roles:
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
     - { role: network-debug-script,   tags: [ network-debug-script ] }