diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index cf465b4..58d009e 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -1,7 +1,6 @@ --- -# TEMPORARY switch for Prater Altair transition -beacon_node_repo_branch: 'unstable' # '{{ node.branch }}' beacon_node_network: 'prater' +beacon_node_repo_branch: '{{ node.branch }}' # TODO Drop this once all nodes have an number. service_number: '{{ node.get("num", False) | ternary(("-%02d"|format(node.get("num", 0))), "") }}' beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}{{ service_number }}' diff --git a/ansible/group_vars/nimbus.pyrmont.yml b/ansible/group_vars/nimbus.pyrmont.yml index 3f3f8cc..73a241d 100644 --- a/ansible/group_vars/nimbus.pyrmont.yml +++ b/ansible/group_vars/nimbus.pyrmont.yml @@ -1,9 +1,7 @@ --- -# TEMPORARY switch for Prater Altair transition -beacon_node_repo_branch: 'unstable' -# TODO Simplify this, maybe change branch name. -#beacon_node_repo_branch: '{{ node.branch is search("libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}' beacon_node_network: 'pyrmont' +beacon_node_repo_branch: '{{ node.branch is search("libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}' +# TODO Simplify this, maybe change branch name. beacon_node_log_level: 'INFO' beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}' # Ports diff --git a/ansible/mainnet.yml b/ansible/mainnet.yml index 74dd99c..c44538b 100644 --- a/ansible/mainnet.yml +++ b/ansible/mainnet.yml @@ -30,9 +30,8 @@ - include_role: name=infra-role-beacon-node-linux tags: beacon-node vars: - # TEMPORARY switch for Mainnet Altair transition beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}-{{ "%02d"|format(node.idx) }}' - beacon_node_repo_branch: 'unstable' + beacon_node_repo_branch: '{{ node.branch }}' beacon_node_threads: '{{ (node.branch == "testing") | ternary(4, 1) }}' beacon_node_build_frequency: '{{ node.build_frequency }}' beacon_node_open_firewall: '{{ node.open_firewall | default(true) }}' diff --git a/ansible/requirements.yml b/ansible/requirements.yml index c2bcd18..f6bf5f7 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -46,7 +46,7 @@ - name: infra-role-beacon-node-linux src: git@github.com:status-im/infra-role-beacon-node-linux.git - version: 822808ca069cc49ab02f6e0ddb57af05efb6bc99 + version: cb79f67a8da89b0e519d3267462a19af0d6e087d scm: git - name: infra-role-beacon-node-windows