Merge pull request #11 from cloudstruct/feature/support_multiple_clients

Add support for non-prsym clients

README.md

@@ -10,8 +10,7 @@ The reasons someone might want to use this repo are:
 * You would like to leverage the experience and knowledge of a company filled with experts doing DevOps As A Service (CloudStruct)
 
 ## Known limitations
-- Currently only built for AWS
-- Currently only supports `Prsym` as ETH2 validator
+- Currently only built for AWS or local servers.
 - Currently only supports `Debian >= 11` or `Ubuntu >= 16`
 
 ## Pre-requisites

ansible/roles/rocketpool/templates/docker-compose.yml.j2

@@ -58,7 +58,9 @@ services:
       - ENABLE_METRICS=${ENABLE_METRICS}
       - ETH2_METRICS_PORT=${ETH2_METRICS_PORT}
       - EXTERNAL_IP=${EXTERNAL_IP}
-      - ETH2_CHECKPOINT_SYNC_URL=${ETH2_CHECKPOINT_SYNC_URL}
+{% if eth.eth2.checkpoint_sync_url | default(False) %}
+      - ETH2_CHECKPOINT_SYNC_URL={{ eth.eth2.checkpoint_sync_url }}
+{% endif %}
     entrypoint: sh
     command: "/setup/start-beacon.sh"
     depends_on:
@@ -70,7 +72,7 @@ services:
     security_opt:
       - no-new-privileges
   validator:
-    image: {{ eth.prysm.validator.image | default('${VALIDATOR_IMAGE}') }}
+    image: {{ eth.validator.image | default('${VALIDATOR_IMAGE}') }}
     user: root
     container_name: ${COMPOSE_PROJECT_NAME}_validator
     restart: unless-stopped

vars/pools/mainnet-00/rocketpool.yaml

@@ -18,28 +18,43 @@ grafana:
 eth:
   network: 'mainnet'
   eth1:
+    # Supports: ['geth']
     client: 'geth'
+
     # Where to store ETH1 persistent data. (/data is EBS volume mount location)
     client_data_path: "/data/eth1/mainnet/"
+
     # Override ETH1 client docker image version
     # image: ethereum/client-go:v1.10.11
+
+    # ETH1 container port
     port: '30303'
 
   eth2:
-    # Currently only supports `prysm'
-    client: 'prysm'
+    # Supports: ['prysm','teku','lighthouse','nimbus']
+    client: 'lighthouse'
+
     # Where to store ETH2 persistent data. (/data is EBS volume mount location)
     client_data_path: "/data/eth2/mainnet/"
+
+    # If you would like to instantly sync using an existing Beacon node, enter its URL here
+    # This option only exists with lighthouse and teku
+    # checkpoint_sync_url:
+
     # If you have a fallback web3 provider, specify it here.
     # fallback_web3provider: 'https://eth-mainnet.gateway.pokt.network/v1/lb/60f86d5a331f6d0034c9ce37'
+
     # Override ETH1 client docker image version
     # image: prysmaticlabs/prysm-beacon-chain:HEAD-a80b1c-debug #v2.0.2
+
+    # Set client max peers
     # max_peers: 50
+
+    # ETH2 container port
     port: '9001'
 
-#  prysm:
-#    validator:
-#      image: prysmaticlabs/prysm-validator:HEAD-a80b1c-debug #v2.0.2
+# validator:
+#   image: prysmaticlabs/prysm-validator:HEAD-a80b1c-debug #v2.0.2
 
 prometheus:
   # https://github.com/prometheus/prometheus/releases