make v6 conditional

Author: barnabasbusa

roles/besu/defaults/main.yaml

@@ -11,28 +11,34 @@ besu_ports_http_rpc: 8545
 besu_ports_engine: 8551
 besu_ports_metrics: 9545
 
+besu_ipv6_enabled: false
+
 besu_container_name: besu
 besu_container_image: hyperledger/besu:latest
 besu_container_env: {}
-besu_container_ports:
+besu_container_ports_ipv4:
   - "127.0.0.1:{{ besu_ports_http_rpc }}:{{ besu_ports_http_rpc }}"
   - "127.0.0.1:{{ besu_ports_engine }}:{{ besu_ports_engine }}"
   - "0.0.0.0:{{ besu_ports_p2p }}:{{ besu_ports_p2p }}"
   - "0.0.0.0:{{ besu_ports_p2p }}:{{ besu_ports_p2p }}/udp"
+
+besu_container_ports_ipv6:
   - "[::]:{{ besu_ports_p2p }}:{{ besu_ports_p2p }}"
   - "[::]:{{ besu_ports_p2p }}:{{ besu_ports_p2p }}/udp"
 
+besu_container_ports: >-
+  {{ besu_container_ports_ipv4 + besu_container_ports_ipv6 if besu_ipv6_enabled else [] }}
+
 besu_container_volumes:
   - "{{ besu_datadir }}:/data"
   - "{{ besu_auth_jwt_path }}:/execution-auth.jwt:ro"
 besu_container_security_opts: []
 besu_container_stop_timeout: "300"
 besu_container_networks: []
-besu_container_command:
+besu_container_command_default:
   - --data-path=/data
   - --nat-method=NONE
   - --p2p-host={{ besu_announced_ip }}
-  - --p2p-host={{ besu_announced_ipv6 }}
   - --p2p-port={{ besu_ports_p2p }}
   - --rpc-http-enabled
   - --rpc-http-host=0.0.0.0
@@ -45,6 +51,13 @@ besu_container_command:
   - --metrics-enabled
   - --metrics-host=0.0.0.0
   - --metrics-port={{ besu_ports_metrics }}
+
+besu_container_command_v6:
+  - --p2p-host-ipv6={{ besu_announced_ipv6 }}
+
+besu_container_command: >-
+  {{ besu_container_command_default + besu_container_command_v6 if besu_ipv6_enabled else [] }}
+
 besu_container_command_extra_args: []
 
 # Default image pull policy

roles/erigon/defaults/main.yaml

@@ -11,20 +11,24 @@ erigon_ports_http_rpc: 8545
 erigon_ports_engine: 8551
 erigon_ports_metrics: 6060
 
-##
-## Main container
-##
+erigon_ipv6_enabled: false
+
 erigon_container_name: erigon
 erigon_container_image: thorax/erigon:stable
 erigon_container_env: {}
-erigon_container_ports:
+erigon_container_ports_ipv4:
   - "127.0.0.1:{{ erigon_ports_engine }}:{{ erigon_ports_engine }}"
   - "127.0.0.1:{{ erigon_ports_http_rpc }}:{{ erigon_ports_http_rpc }}"
   - "0.0.0.0:{{ erigon_ports_p2p }}:{{ erigon_ports_p2p }}"
   - "0.0.0.0:{{ erigon_ports_p2p }}:{{ erigon_ports_p2p }}/udp"
+
+erigon_container_ports_ipv6:
   - "[::]:{{ erigon_ports_p2p }}:{{ erigon_ports_p2p }}"
   - "[::]:{{ erigon_ports_p2p }}:{{ erigon_ports_p2p }}/udp"
 
+erigon_container_ports: >-
+  {{ erigon_container_ports_ipv4 + erigon_container_ports_ipv6 if erigon_ipv6_enabled else [] }}
+
 erigon_container_volumes:
   - "{{ erigon_datadir }}:/data"
   - "{{ erigon_auth_jwt_path }}:/execution-auth.jwt:ro"
@@ -33,10 +37,9 @@ erigon_container_stop_timeout: "300"
 erigon_container_networks: []
 erigon_container_entrypoint:
   - erigon
-erigon_container_command:
+erigon_container_command_default:
   - --datadir=/data
   - --nat=extip:{{ erigon_announced_ip }}
-  - --nat=extip:{{ erigon_announced_ipv6 }}
   - --port={{ erigon_ports_p2p }}
   - --http
   - --http.addr=0.0.0.0
@@ -48,6 +51,13 @@ erigon_container_command:
   - --metrics
   - --metrics.addr=0.0.0.0
   - --metrics.port={{ erigon_ports_metrics }}
+
+erigon_container_command_v6:
+  - --nat=extip:{{ erigon_announced_ipv6 }}
+
+erigon_container_command: >-
+  {{ erigon_container_command_default + erigon_container_command_v6 if erigon_ipv6_enabled else [] }}
+
 erigon_container_command_extra_args: []
 #  - --prune=htc
 

roles/ethereumjs/defaults/main.yaml

@@ -10,24 +10,31 @@ ethereumjs_ports_p2p: 30303
 ethereumjs_ports_http_rpc: 8545
 ethereumjs_ports_engine: 8551
 
+ethereumjs_ipv6_enabled: false
+
 ethereumjs_container_name: ethereumjs
 ethereumjs_container_image: g11tech/ethereumjs:latest
 ethereumjs_container_env: {}
-ethereumjs_container_ports:
+ethereumjs_container_ports_ipv4:
   - "127.0.0.1:{{ ethereumjs_ports_http_rpc }}:{{ ethereumjs_ports_http_rpc }}"
   - "127.0.0.1:{{ ethereumjs_ports_engine }}:{{ ethereumjs_ports_engine }}"
   - "0.0.0.0:{{ ethereumjs_ports_p2p }}:{{ ethereumjs_ports_p2p }}"
   - "0.0.0.0:{{ ethereumjs_ports_p2p }}:{{ ethereumjs_ports_p2p }}/udp"
+
+ethereumjs_container_ports_ipv6:
   - "[::]:{{ ethereumjs_ports_p2p }}:{{ ethereumjs_ports_p2p }}"
   - "[::]:{{ ethereumjs_ports_p2p }}:{{ ethereumjs_ports_p2p }}/udp"
 
+ethereumjs_container_ports: >-
+  {{ ethereumjs_container_ports_ipv4 + ethereumjs_container_ports_ipv6 if ethereumjs_ipv6_enabled else [] }}
+
 ethereumjs_container_volumes:
   - "{{ ethereumjs_datadir }}:/data"
   - "{{ ethereumjs_auth_jwt_path }}:/execution-auth.jwt:ro"
 ethereumjs_container_security_opts: []
 ethereumjs_container_stop_timeout: "300"
 ethereumjs_container_networks: []
-ethereumjs_container_command:
+ethereumjs_container_command_default:
   - --dataDir=/data
   - --port={{ ethereumjs_ports_p2p }}
   - --rpc
@@ -39,7 +46,13 @@ ethereumjs_container_command:
   - --rpcEnginePort={{ ethereumjs_ports_engine }}
   - --jwt-secret=/execution-auth.jwt
   - --extIP={{ ethereumjs_announced_ip }}
+
+ethereumjs_container_command_v6: []
   # - --extIP={{ ethereumjs_announced_ipv6 }} # not supported
+
+ethereumjs_container_command: >-
+  {{ ethereumjs_container_command_default + ethereumjs_container_command_v6 if ethereumjs_ipv6_enabled else [] }}
+
 ethereumjs_container_command_extra_args: []
 
 # Default image pull policy

roles/geth/defaults/main.yaml

@@ -11,23 +11,31 @@ geth_ports_http_rpc: 8545
 geth_ports_engine: 8551
 geth_ports_metrics: 6060
 
+geth_ipv6_enabled: false
+
 geth_container_name: geth
 geth_container_image: ethereum/client-go:stable
 geth_container_env: {}
-geth_container_ports:
+geth_container_ports_ipv4:
   - "127.0.0.1:{{ geth_ports_http_rpc }}:{{ geth_ports_http_rpc }}"
   - "127.0.0.1:{{ geth_ports_engine }}:{{ geth_ports_engine }}"
   - "0.0.0.0:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}"
   - "0.0.0.0:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}/udp"
+
+geth_container_ports_ipv6:
   - "[::]:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}"
   - "[::]:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}/udp"
+
+geth_container_ports: >-
+  {{ geth_container_ports_ipv4 + geth_container_ports_ipv6 if geth_ipv6_enabled else [] }}
+
 geth_container_volumes:
   - "{{ geth_datadir }}:/data"
   - "{{ geth_auth_jwt_path }}:/execution-auth.jwt:ro"
 geth_container_security_opts: []
 geth_container_stop_timeout: "300"
 geth_container_networks: []
-geth_container_command:
+geth_container_command_default:
   - --datadir=/data
   - --port={{ geth_ports_p2p }}
   - --http
@@ -38,11 +46,17 @@ geth_container_command:
   - --authrpc.vhosts=*
   - --authrpc.jwtsecret=/execution-auth.jwt
   - --nat=extip:{{ geth_announced_ip }}
-  - --nat=extip:{{ geth_announced_ipv6 }}
   - --metrics
   - --metrics.port={{ geth_ports_metrics }}
   - --metrics.addr=0.0.0.0
   - --discovery.v5
+
+geth_container_command_v6:
+  - --nat=extip:{{ geth_announced_ipv6 }}
+
+geth_container_command: >-
+  {{ geth_container_command_default + geth_container_command_v6 if geth_ipv6_enabled else [] }}
+
 geth_container_command_extra_args: []
 #  - --http.api=eth,net,web3
 #  - --http.vhosts=*

roles/lighthouse/defaults/main.yaml

@@ -15,8 +15,8 @@ lighthouse_ports_p2p_udp: 9000
 lighthouse_ports_http_beacon: 5052
 lighthouse_ports_metrics: 5054
 lighthouse_ports_quic: 9001
-lighthouse_ports_quick_ipv6: 9001
 
+lighthouse_ipv6_enabled: false
 
 lighthouse_validator_enabled: false
 lighthouse_validator_fee_recipient: "0xF29Ff96aaEa6C9A1fBa851f74737f3c069d4f1a9" # theprotocolguild.eth
@@ -30,38 +30,40 @@ lighthouse_validator_datadir: /data/lighthouse-validator
 lighthouse_container_name: lighthouse
 lighthouse_container_image: sigp/lighthouse:latest
 lighthouse_container_env: {}
-lighthouse_container_ports:
+lighthouse_container_ports_ipv4:
   - "127.0.0.1:{{ lighthouse_ports_http_beacon }}:{{ lighthouse_ports_http_beacon }}"
   - "0.0.0.0:{{ lighthouse_ports_p2p_tcp }}:{{ lighthouse_ports_p2p_tcp }}"
   - "0.0.0.0:{{ lighthouse_ports_p2p_udp }}:{{ lighthouse_ports_p2p_udp }}/udp"
+  - "0.0.0.0:{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}"
+  - "0.0.0.0:{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}/udp"
+
+lighthouse_container_ports_ipv6:
   - "[::]:{{ lighthouse_ports_p2p_tcp }}:{{ lighthouse_ports_p2p_tcp }}"
   - "[::]:{{ lighthouse_ports_p2p_udp }}:{{ lighthouse_ports_p2p_udp }}/udp"
-  - "{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}"
-  - "{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}/udp"
+  - "[::]:{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}"
+  - "[::]:{{ lighthouse_ports_quic }}:{{ lighthouse_ports_quic }}/udp"
+
+lighthouse_container_ports: >-
+  {{ lighthouse_container_ports_ipv4 + lighthouse_container_ports_ipv6 if lighthouse_ipv6_enabled else [] }}
 
 lighthouse_container_volumes:
   - "{{ lighthouse_datadir }}:/data"
   - "{{ lighthouse_auth_jwt_path }}:/execution-auth.jwt:ro"
 lighthouse_container_security_opts: []
 lighthouse_container_stop_timeout: "300"
 lighthouse_container_networks: []
-lighthouse_container_command:
+lighthouse_container_command_default:
   - lighthouse
   - beacon_node
   - --datadir=/data
   - --disable-upnp
   - --disable-enr-auto-update
   - --enr-address={{ lighthouse_announced_ip }}
-  - --enr-address={{ lighthouse_announced_ipv6 }}
-  - --enr-tcp6-port={{ lighthouse_ports_p2p_tcp }}
   - --enr-tcp-port={{ lighthouse_ports_p2p_tcp }}
   - --enr-udp-port={{ lighthouse_ports_p2p_udp }}
-  - --enr-udp6-port={{ lighthouse_ports_p2p_udp }}
   - --listen-address=0.0.0.0
   - --port={{ lighthouse_ports_p2p_tcp }}
-  - --port6={{ lighthouse_ports_p2p_tcp }}
   - --discovery-port={{ lighthouse_ports_p2p_udp }}
-  - --discovery-port6={{ lighthouse_ports_p2p_udp }}
   - --http
   - --http-address=0.0.0.0
   - --http-port={{ lighthouse_ports_http_beacon }}
@@ -72,10 +74,20 @@ lighthouse_container_command:
   - --metrics-allow-origin=*
   - --metrics-port={{ lighthouse_ports_metrics }}
   - --quic-port={{ lighthouse_ports_quic }}
-  - --quic-port6={{ lighthouse_ports_quick_ipv6 }}
   - --enr-quic-port={{ lighthouse_ports_quic }}
+
+lighthouse_container_command_v6:
+  - --enr-address={{ lighthouse_announced_ipv6 }}
+  - --enr-tcp6-port={{ lighthouse_ports_p2p_tcp }}
+  - --enr-udp6-port={{ lighthouse_ports_p2p_udp }}
+  - --port6={{ lighthouse_ports_p2p_tcp }}
+  - --discovery-port6={{ lighthouse_ports_p2p_udp }}
+  - --quic-port6={{ lighthouse_ports_quic }}
   - --enr-quic6-port={{ lighthouse_ports_quic }}
 
+lighthouse_container_command: >-
+  {{ lighthouse_container_command_default + lighthouse_container_command_v6 if lighthouse_ipv6_enabled else [] }}
+
 lighthouse_container_command_extra_args: []
 
 checkpoint_sync_url: https://beaconstate.ethstaker.cc

roles/lodestar/defaults/main.yaml

@@ -11,12 +11,14 @@ lodestar_announced_ipv6: "{{ ansible_default_ipv6.address }}"
 lodestar_cleanup: false # when set to "true" it will remove the container(s)
 
 lodestar_ports_p2p_tcp: 9000
-lodestar_ports_p2p_tcp_ipv6: 9002
 lodestar_ports_p2p_udp: 9000
-lodestar_ports_p2p_udp_ipv6: 9002
+lodestar_ports_p2p_udp_ipv6: 9002 # temporary until we have a fix for https://github.com/ChainSafe/lodestar/issues/6531#issuecomment-1995707028
+lodestar_ports_p2p_tcp_ipv6: 9002
 lodestar_ports_http_beacon: 9596
 lodestar_ports_metrics: 8008
 
+lodestar_ipv6_enabled: false
+
 lodestar_validator_enabled: false
 lodestar_validator_fee_recipient: "0xF29Ff96aaEa6C9A1fBa851f74737f3c069d4f1a9" # theprotocolguild.eth
 lodestar_validator_datadir: /data/lodestar-validator
@@ -29,32 +31,33 @@ lodestar_validator_datadir: /data/lodestar-validator
 lodestar_container_name: lodestar
 lodestar_container_image: chainsafe/lodestar:latest
 lodestar_container_env: {}
-lodestar_container_ports:
+lodestar_container_ports_ipv4:
   - "127.0.0.1:{{ lodestar_ports_http_beacon }}:{{ lodestar_ports_http_beacon }}"
   - "0.0.0.0:{{ lodestar_ports_p2p_tcp }}:{{ lodestar_ports_p2p_tcp }}"
   - "0.0.0.0:{{ lodestar_ports_p2p_udp }}:{{ lodestar_ports_p2p_udp }}/udp"
+
+lodestar_container_ports_ipv6:
   - "[::]:{{ lodestar_ports_p2p_tcp_ipv6 }}:{{ lodestar_ports_p2p_tcp_ipv6 }}"
   - "[::]:{{ lodestar_ports_p2p_udp_ipv6 }}:{{ lodestar_ports_p2p_udp_ipv6 }}/udp"
+
+lodestar_container_ports: >-
+  {{ lodestar_container_ports_ipv4 + lodestar_container_ports_ipv6 if lodestar_ipv6_enabled else [] }}
+
 lodestar_container_volumes:
   - "{{ lodestar_datadir }}:/data"
   - "{{ lodestar_auth_jwt_path }}:/execution-auth.jwt:ro"
 lodestar_container_security_opts: []
 lodestar_container_stop_timeout: "300"
 lodestar_container_networks: []
-lodestar_container_command:
+lodestar_container_command_default:
   - beacon
   - --dataDir=/data
   - --discv5
   - --listenAddress=0.0.0.0
-  - --listenAddress6=::0
   - --port={{ lodestar_ports_p2p_tcp }}
-  - --port6={{ lodestar_ports_p2p_tcp_ipv6 }}
   - --enr.ip={{ lodestar_announced_ip }}
-  - --enr.ip6={{ lodestar_announced_ipv6 }}
   - --enr.tcp={{ lodestar_ports_p2p_tcp }}
-  - --enr.tcp6={{ lodestar_ports_p2p_tcp_ipv6 }}
   - --enr.udp={{ lodestar_ports_p2p_udp }}
-  - --enr.udp6={{ lodestar_ports_p2p_udp_ipv6 }}
   - --discoveryPort6={{ lodestar_ports_p2p_udp_ipv6 }}
   - --rest
   - --rest.address=0.0.0.0
@@ -64,6 +67,17 @@ lodestar_container_command:
   - --metrics
   - --metrics.address=0.0.0.0
   - --metrics.port={{ lodestar_ports_metrics }}
+
+lodestar_container_command_v6:
+  - --listenAddress6=::0
+  - --port6={{ lodestar_ports_p2p_tcp_ipv6 }}
+  - --enr.ip6={{ lodestar_announced_ipv6 }}
+  - --enr.tcp6={{ lodestar_ports_p2p_tcp_ipv6 }}
+  - --enr.udp6={{ lodestar_ports_p2p_udp_ipv6 }}
+
+lodestar_container_command: >-
+  {{ lodestar_container_command_default + lodestar_container_command_v6 if lodestar_ipv6_enabled else [] }}
+
 lodestar_container_command_extra_args: []
 
 checkpoint_sync_url: https://beaconstate.ethstaker.cc