Skip to content

Commit 0dbabe9

Browse files
committed
Remove --is-aggregator from checkpoint-feature (moved to devnet3)
1 parent 51f6b8d commit 0dbabe9

7 files changed

Lines changed: 7 additions & 28 deletions

File tree

‎ansible/roles/ethlambda/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,12 @@
3838
loop:
3939
- enrFields.quic
4040
- metricsPort
41-
- isAggregator
4241
when: node_name is defined
4342

44-
- name: Set node ports and aggregator flag
43+
- name: Set node ports
4544
set_fact:
4645
ethlambda_quic_port: "{{ ethlambda_node_config.results[0].stdout }}"
4746
ethlambda_metrics_port: "{{ ethlambda_node_config.results[1].stdout }}"
48-
ethlambda_is_aggregator: "{{ 'true' if (ethlambda_node_config.results[2].stdout | default('') | trim) == 'true' else 'false' }}"
4947
when: ethlambda_node_config is defined
5048

5149
- name: Ensure node key file exists
@@ -99,7 +97,6 @@
9997
--node-key /config/{{ node_name }}.key
10098
--metrics-address 0.0.0.0
10199
--metrics-port {{ ethlambda_metrics_port }}
102-
{{ '--is-aggregator' if (ethlambda_is_aggregator | default('false')) == 'true' else '' }}
103100
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
104101
register: ethlambda_container
105102
changed_when: ethlambda_container.rc == 0

‎ansible/roles/grandine/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@
3939
- enrFields.quic
4040
- metricsPort
4141
- privkey
42-
- isAggregator
4342
when: node_name is defined
4443

45-
- name: Set node ports and aggregator flag
44+
- name: Set node ports
4645
set_fact:
4746
grandine_quic_port: "{{ grandine_node_config.results[0].stdout }}"
4847
grandine_metrics_port: "{{ grandine_node_config.results[1].stdout }}"
4948
grandine_privkey: "{{ grandine_node_config.results[2].stdout }}"
50-
grandine_is_aggregator: "{{ 'true' if (grandine_node_config.results[3].stdout | default('') | trim) == 'true' else 'false' }}"
5149
when: grandine_node_config is defined
5250

5351
- name: Ensure node key file exists
@@ -106,7 +104,6 @@
106104
--metrics
107105
--http-address 0.0.0.0
108106
--http-port {{ grandine_metrics_port }}
109-
{{ '--is-aggregator' if (grandine_is_aggregator | default('false')) == 'true' else '' }}
110107
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
111108
register: grandine_container
112109
changed_when: grandine_container.rc == 0

‎ansible/roles/lantern/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
- enrFields.quic
3939
- metricsPort
4040
- privkey
41-
- isAggregator
4241
when: node_name is defined
4342

44-
- name: Set node ports and aggregator flag
43+
- name: Set node ports
4544
set_fact:
4645
lantern_quic_port: "{{ lantern_node_config.results[0].stdout }}"
4746
lantern_metrics_port: "{{ lantern_node_config.results[1].stdout }}"
4847
lantern_privkey: "{{ lantern_node_config.results[2].stdout }}"
49-
lantern_is_aggregator: "{{ 'true' if (lantern_node_config.results[3].stdout | default('') | trim) == 'true' else 'false' }}"
5048
when: lantern_node_config is defined
5149

5250
- name: Ensure node key file exists
@@ -100,7 +98,6 @@
10098
--metrics-port {{ lantern_metrics_port }}
10199
--http-port 5055
102100
--hash-sig-key-dir /config/hash-sig-keys
103-
{{ '--is-aggregator' if (lantern_is_aggregator | default('false')) == 'true' else '' }}
104101
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
105102
register: lantern_container
106103
changed_when: lantern_container.rc == 0

‎ansible/roles/lighthouse/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
- enrFields.quic
3939
- metricsPort
4040
- privkey
41-
- isAggregator
4241
when: node_name is defined
4342

44-
- name: Set node ports and aggregator flag
43+
- name: Set node ports
4544
set_fact:
4645
lighthouse_quic_port: "{{ lighthouse_node_config.results[0].stdout }}"
4746
lighthouse_metrics_port: "{{ lighthouse_node_config.results[1].stdout }}"
4847
lighthouse_privkey: "{{ lighthouse_node_config.results[2].stdout }}"
49-
lighthouse_is_aggregator: "{{ 'true' if (lighthouse_node_config.results[3].stdout | default('') | trim) == 'true' else 'false' }}"
5048
when: lighthouse_node_config is defined
5149

5250
- name: Ensure node key file exists
@@ -104,7 +102,6 @@
104102
--metrics
105103
--metrics-address 0.0.0.0
106104
--metrics-port {{ lighthouse_metrics_port }}
107-
{{ '--is-aggregator' if (lighthouse_is_aggregator | default('false')) == 'true' else '' }}
108105
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
109106
register: lighthouse_container
110107
changed_when: lighthouse_container.rc == 0

‎ansible/roles/qlean/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
- enrFields.quic
3939
- metricsPort
4040
- privkey
41-
- isAggregator
4241
when: node_name is defined
4342

44-
- name: Set node ports and aggregator flag
43+
- name: Set node ports
4544
set_fact:
4645
qlean_quic_port: "{{ qlean_node_config.results[0].stdout }}"
4746
qlean_metrics_port: "{{ qlean_node_config.results[1].stdout }}"
4847
qlean_privkey: "{{ qlean_node_config.results[2].stdout }}"
49-
qlean_is_aggregator: "{{ 'true' if (qlean_node_config.results[3].stdout | default('') | trim) == 'true' else 'false' }}"
5048
when: qlean_node_config is defined
5149

5250
- name: Extract validator index from validators.yaml
@@ -113,7 +111,6 @@
113111
--node-key /config/{{ node_name }}.key
114112
--listen-addr /ip4/0.0.0.0/udp/{{ qlean_quic_port }}/quic-v1
115113
--prometheus-port {{ qlean_metrics_port }}
116-
{{ '--is-aggregator' if (qlean_is_aggregator | default('false')) == 'true' else '' }}
117114
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
118115
-ldebug
119116
register: qlean_container

‎ansible/roles/ream/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
- enrFields.quic
3939
- metricsPort
4040
- privkey
41-
- isAggregator
4241
when: node_name is defined
4342

44-
- name: Set node ports and aggregator flag
43+
- name: Set node ports
4544
set_fact:
4645
ream_quic_port: "{{ ream_node_config.results[0].stdout }}"
4746
ream_metrics_port: "{{ ream_node_config.results[1].stdout }}"
4847
ream_privkey: "{{ ream_node_config.results[2].stdout }}"
49-
ream_is_aggregator: "{{ 'true' if (ream_node_config.results[3].stdout | default('') | trim) == 'true' else 'false' }}"
5048
when: ream_node_config is defined
5149

5250
- name: Ensure node key file exists
@@ -100,7 +98,6 @@
10098
--metrics-address 0.0.0.0
10199
--metrics-port {{ ream_metrics_port }}
102100
--http-address 0.0.0.0
103-
{{ '--is-aggregator' if (ream_is_aggregator | default('false')) == 'true' else '' }}
104101
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
105102
register: ream_container
106103
changed_when: ream_container.rc == 0

‎ansible/roles/zeam/tasks/main.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@
4545
loop:
4646
- metricsPort
4747
- privkey
48-
- isAggregator
4948
when: node_name is defined
5049

51-
- name: Set node metrics port and aggregator flag
50+
- name: Set node metrics port
5251
set_fact:
5352
zeam_metrics_port: "{{ node_config.results[0].stdout }}"
54-
zeam_is_aggregator: "{{ 'true' if (node_config.results[2].stdout | default('') | trim) == 'true' else 'false' }}"
5553
when: node_config is defined
5654

5755
- name: Ensure node key file exists
@@ -109,7 +107,6 @@
109107
--node-key /config/{{ node_name }}.key
110108
--metrics_enable
111109
--api-port {{ zeam_metrics_port }}
112-
{{ '--is-aggregator' if (zeam_is_aggregator | default('false')) == 'true' else '' }}
113110
{{ ('--checkpoint-sync-url ' + checkpoint_sync_url) if (checkpoint_sync_url is defined and checkpoint_sync_url | length > 0) else '' }}
114111
register: zeam_container_result
115112
changed_when: zeam_container_result.rc == 0

0 commit comments

Comments
 (0)