super minor commit

playbooks/setup_execution_and_consensus_full.yml

@@ -17,7 +17,7 @@
 
 # uploads validator keys corresponding to the host
 - import_playbook: tasks/upload_validator_keys.yml
-  when: no_validator_keys != 'true'
+  when: no_validator_keys|bool != true
 
 # uploads custom chain config and genesis data if needed
 - import_playbook: tasks/upload_custom_config_data.yml
@@ -26,7 +26,14 @@
 
 # inits geth instance
 - import_playbook: tasks/init_geth_node.yml
-  when: el_client_name == 'geth' or el_client_name == 'erigon'
+  when: (testnet_type == 'custom') and
+    (el_client_name == 'geth' or el_client_name == 'erigon')
+
+# inits nimbus instance
+- import_playbook: tasks/checkpoint_sync_nimbus_node.yml
+  when: (testnet_type != 'custom') and
+    (cl_client_name == 'nimbus') and
+    (deploy_mode == 'sync')
 
 # stars beacon node docker container
 - import_playbook: tasks/start_beacon.yml

playbooks/tasks/checkpoint_sync_nimbus_node.yml

@@ -0,0 +1,17 @@
+- name: Checkpoint sync nimbus node
+  hosts: nimbus
+  gather_facts: true
+  tasks:
+    - name: Run nimbus checkpoint sync
+      docker_container:
+        name: "checkpoint_sync_nimbus"
+        state: started
+        image: "{{ beacon_image_name }}"
+        pull: true
+        restart_policy: no
+        auto_remove: false
+        detach: no
+        network_mode: host
+        volumes: "{{beacon_volumes}}"
+        command: "{{ beacon_checkpoint_sync_args }}"
+        env: "{{ cl_env | default({}) }}"

playbooks/tasks/templates/static_nodes/static-nodes.j2

@@ -1 +1 @@
-{{ el_static_enodes | to_json }}
+{{ el_bootnode_enode | to_json }}

playbooks/update_execution_beacon_and_validator.yml

@@ -26,7 +26,8 @@
 #        (testnet_type == 'prater' and cl_client_name == 'prysm')
 
 - import_playbook: tasks/init_geth_node.yml
-  when: el_client_name == 'geth' or el_client_name == 'erigon'
+  when: (testnet_type == 'custom') and
+    (el_client_name == 'geth' or el_client_name == 'erigon')
 
 # starts execution node docker container
 - import_playbook: tasks/start_execution_node.yml

playbooks/wipe_all.yml

@@ -44,17 +44,17 @@
         path: "{{ home_dir }}/jwtsecret"
         state: absent
     - name: Remove static nodes dir
-      file: 
+      file:
         path: "{{home_dir}}/static_nodes"
         state: absent
     - name: Stop RPC snooper container
       shell: "docker rm -f {{snoop_container_name}}"
       register: stop_result
       failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
-    - name: Stop metrics container
-      shell: "docker rm -f {{eth_metrics_exporter_name}}"
-      register: stop_result
-      failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
+#    - name: Stop metrics container
+#      shell: "docker rm -f {{eth_metrics_exporter_name}}"
+#      register: stop_result
+#      failed_when: "(stop_result.rc >= 1) and not ('No such container' in stop_result.stderr)"
     # - name: Stop node_exporter service
     #   become: true
     #   systemd:

terraform/environment/withdrawal-mainnet-shadowfork-1/ansible_inventory.tmpl

@@ -0,0 +1,121 @@
+%{ for gid, group in groups ~}
+[${replace(gid, "-", "_")}]
+%{ for key, host in hosts ~}
+%{ if host.group == gid ~}
+${host.hostname} ansible_host=${host.ip} cloud=${host.cloud} cloud_region=${host.region}
+%{ endif ~}
+%{ endfor ~}
+
+%{ endfor ~}
+
+[lighthouse:children]
+lighthouse_besu
+lighthouse_geth
+lighthouse_erigon
+lighthouse_nethermind
+
+[teku:children]
+bootnode
+teku_besu
+teku_geth
+teku_erigon
+teku_nethermind
+
+[prysm:children]
+prysm_besu
+prysm_geth
+prysm_erigon
+prysm_nethermind
+
+[nimbus:children]
+nimbus_besu
+nimbus_geth
+nimbus_erigon
+nimbus_nethermind
+
+[lodestar:children]
+lodestar_besu
+lodestar_geth
+lodestar_erigon
+lodestar_nethermind
+lodestar_ethereumjs
+
+[besu:children]
+lighthouse_besu
+teku_besu
+prysm_besu
+nimbus_besu
+lodestar_besu
+
+[geth:children]
+bootnode
+lighthouse_geth
+teku_geth
+prysm_geth
+nimbus_geth
+lodestar_geth
+
+[erigon:children]
+lighthouse_erigon
+teku_erigon
+prysm_erigon
+nimbus_erigon
+lodestar_erigon
+
+[nethermind:children]
+lighthouse_nethermind
+teku_nethermind
+prysm_nethermind
+nimbus_nethermind
+lodestar_nethermind
+
+[ethereumjs:children]
+lodestar_ethereumjs
+
+[consensus:children]
+lighthouse
+teku
+prysm
+nimbus
+lodestar
+
+[beacon:children]
+lighthouse
+teku
+prysm
+nimbus
+lodestar
+
+[execution:children]
+besu
+geth
+erigon
+nethermind
+ethereumjs
+
+[validator:children]
+beacon
+
+[txfuzz:children]
+bootnode
+
+[forkmon:children]
+bootnode
+
+[ethstats_server:children]
+bootnode
+
+[faucet:children]
+bootnode
+
+[landing_page:children]
+bootnode
+
+[explorer:children]
+bootnode
+
+[reverse_proxy:children]
+bootnode
+
+[beaconchain_explorer:children]
+bootnode