fix empty to 0.0.0.0

Author: barnabasbusa

roles/geth/defaults/main.yaml

@@ -7,7 +7,6 @@ geth_announced_ipv6: "{{ ansible_default_ipv6.address }}"
 geth_cleanup: false # when set to "true" it will remove the container
 
 geth_ports_p2p: 30303
-geth_ports_p2p_ipv6: 30304
 geth_ports_http_rpc: 8545
 geth_ports_engine: 8551
 geth_ports_metrics: 6060
@@ -18,10 +17,10 @@ geth_container_env: {}
 geth_container_ports:
   - "127.0.0.1:{{ geth_ports_http_rpc }}:{{ geth_ports_http_rpc }}"
   - "127.0.0.1:{{ geth_ports_engine }}:{{ geth_ports_engine }}"
-  - "{{ geth_ports_p2p }}:{{ geth_ports_p2p }}"
-  - "{{ geth_ports_p2p }}:{{ geth_ports_p2p }}/udp"
-  - "[::]:{{ geth_ports_p2p_ipv6 }}:{{ geth_ports_p2p_ipv6 }}"
-  - "[::]:{{ geth_ports_p2p_ipv6 }}:{{ geth_ports_p2p_ipv6 }}/udp"
+  - "0.0.0.0:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}"
+  - "0.0.0.0:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}/udp"
+  - "[::]:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}"
+  - "[::]:{{ geth_ports_p2p }}:{{ geth_ports_p2p }}/udp"
 geth_container_volumes:
   - "{{ geth_datadir }}:/data"
   - "{{ geth_auth_jwt_path }}:/execution-auth.jwt:ro"

roles/lighthouse/defaults/main.yaml

@@ -11,9 +11,7 @@ lighthouse_announced_ipv6: "{{ ansible_default_ipv6.address }}"
 lighthouse_cleanup: false # when set to "true" it will remove the container(s)
 
 lighthouse_ports_p2p_tcp: 9000
-lighthouse_ports_p2p_tcp_ipv6: 9002
 lighthouse_ports_p2p_udp: 9000
-lighthouse_ports_p2p_udp_ipv6: 9002
 lighthouse_ports_http_beacon: 5052
 lighthouse_ports_metrics: 5054
 lighthouse_ports_quic: 9001
@@ -34,12 +32,13 @@ lighthouse_container_image: sigp/lighthouse:latest
 lighthouse_container_env: {}
 lighthouse_container_ports:
   - "127.0.0.1:{{ lighthouse_ports_http_beacon }}:{{ lighthouse_ports_http_beacon }}"
-  - "{{ lighthouse_ports_p2p_tcp }}:{{ lighthouse_ports_p2p_tcp }}"
-  - "{{ lighthouse_ports_p2p_udp }}:{{ lighthouse_ports_p2p_udp }}/udp"
+  - "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"
+  - "[::]:{{ 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_p2p_tcp_ipv6 }}:{{ lighthouse_ports_p2p_udp_ipv6 }}"
-  - "[::]:{{ lighthouse_ports_p2p_udp_ipv6 }}:{{ lighthouse_ports_p2p_udp_ipv6 }}/udp"
+
 lighthouse_container_volumes:
   - "{{ lighthouse_datadir }}:/data"
   - "{{ lighthouse_auth_jwt_path }}:/execution-auth.jwt:ro"
@@ -54,15 +53,15 @@ lighthouse_container_command:
   - --disable-enr-auto-update
   - --enr-address={{ lighthouse_announced_ip }}
   - --enr-address={{ lighthouse_announced_ipv6 }}
-  - --enr-tcp6-port={{ lighthouse_ports_p2p_tcp_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_ipv6 }}
+  - --enr-udp6-port={{ lighthouse_ports_p2p_udp }}
   - --listen-address=0.0.0.0
   - --port={{ lighthouse_ports_p2p_tcp }}
-  - --port6={{ lighthouse_ports_p2p_tcp_ipv6 }}
+  - --port6={{ lighthouse_ports_p2p_tcp }}
   - --discovery-port={{ lighthouse_ports_p2p_udp }}
-  - --discovery-port6={{ lighthouse_ports_p2p_udp_ipv6 }}
+  - --discovery-port6={{ lighthouse_ports_p2p_udp }}
   - --http
   - --http-address=0.0.0.0
   - --http-port={{ lighthouse_ports_http_beacon }}

roles/lodestar/defaults/main.yaml

@@ -11,9 +11,7 @@ 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_http_beacon: 9596
 lodestar_ports_metrics: 8008
 
@@ -31,10 +29,10 @@ lodestar_container_image: chainsafe/lodestar:latest
 lodestar_container_env: {}
 lodestar_container_ports:
   - "127.0.0.1:{{ lodestar_ports_http_beacon }}:{{ lodestar_ports_http_beacon }}"
-  - "{{ lodestar_ports_p2p_tcp }}:{{ lodestar_ports_p2p_tcp }}"
-  - "{{ lodestar_ports_p2p_udp }}:{{ lodestar_ports_p2p_udp }}/udp"
-  - "[::]:{{ lodestar_ports_p2p_tcp_ipv6 }}:{{ lodestar_ports_p2p_tcp_ipv6 }}"
-  - "[::]:{{ lodestar_ports_p2p_udp_ipv6 }}:{{ lodestar_ports_p2p_udp_ipv6 }}/udp"
+  - "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_ports_p2p_tcp }}:{{ lodestar_ports_p2p_tcp }}"
+  - "[::]:{{ lodestar_ports_p2p_udp }}:{{ lodestar_ports_p2p_udp }}/udp"
 lodestar_container_volumes:
   - "{{ lodestar_datadir }}:/data"
   - "{{ lodestar_auth_jwt_path }}:/execution-auth.jwt:ro"
@@ -48,14 +46,14 @@ lodestar_container_command:
   - --listenAddress=0.0.0.0
   - --listenAddress6=::0
   - --port={{ lodestar_ports_p2p_tcp }}
-  - --port6={{ lodestar_ports_p2p_tcp_ipv6 }}
+  - --port6={{ lodestar_ports_p2p_tcp }}
   - --enr.ip={{ lodestar_announced_ip }}
   - --enr.ip6={{ lodestar_announced_ipv6 }}
   - --enr.tcp={{ lodestar_ports_p2p_tcp }}
-  - --enr.tcp6={{ lodestar_ports_p2p_tcp_ipv6 }}
+  - --enr.tcp6={{ lodestar_ports_p2p_tcp }}
   - --enr.udp={{ lodestar_ports_p2p_udp }}
-  - --enr.udp6={{ lodestar_ports_p2p_udp_ipv6 }}
-  - --discoveryPort6={{ lodestar_ports_p2p_udp_ipv6 }}
+  - --enr.udp6={{ lodestar_ports_p2p_udp }}
+  - --discoveryPort6={{ lodestar_ports_p2p_udp }}
   - --rest
   - --rest.address=0.0.0.0
   - --rest.port={{ lodestar_ports_http_beacon }}