diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index ff4e30b..fe2f625 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -48,7 +48,7 @@ - name: Bootstrap Windows hosts become: false hosts: - - nimbus-prater-windows + - nimbus-holesky-windows roles: - role: infra-role-bootstrap-windows vars: { fact_path: 'C:/ansible/facts.d' } diff --git a/ansible/group_vars/nimbus.holesky.yml b/ansible/group_vars/nimbus.holesky.yml index 8ca05e6..93a8387 100644 --- a/ansible/group_vars/nimbus.holesky.yml +++ b/ansible/group_vars/nimbus.holesky.yml @@ -95,6 +95,8 @@ beacon_node_exec_layer_urls: ['http://localhost:{{ exec_layer_authrpc_port }}'] beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret | mandatory }}' # Suggests it to the Execution Layer client. beacon_node_suggested_fee_recipient: '{{lookup("bitwarden", "nimbus/wallet/testnets", field="address")}}' +# Windows service user +beacon_node_service_user_pass: '{{lookup("bitwarden", "nimbus/windows", field="password")}}' # MEV Payload Builder beacon_node_payload_builder_enabled: '{{ node.get("payload_builder", false) }}' beacon_node_payload_builder_url: 'https://boost-relay-holesky.flashbots.net/' diff --git a/ansible/holesky.yml b/ansible/holesky.yml index 6766ec6..26ff4fc 100644 --- a/ansible/holesky.yml +++ b/ansible/holesky.yml @@ -28,7 +28,6 @@ - name: Deploy Holesky MacOS Beacon Nodes become: true - serial: '{{ serial|default(1) }}' hosts: - nimbus-holesky-macm2 vars_files: layout/holesky.yml @@ -36,3 +35,13 @@ - include_role: name=infra-role-beacon-node-macos with_items: '{{ nodes_layout[hostname] }}' loop_control: { loop_var: node, index_var: idx } + +- name: Deploy Holesky Windows Beacon Nodes + become: true + hosts: + - nimbus-holesky-windows + vars_files: layout/holesky.yml + tasks: + - include_role: name=infra-role-beacon-node-windows + with_items: '{{ nodes_layout[hostname] }}' + loop_control: { loop_var: node, index_var: idx } diff --git a/ansible/host_vars/windows-01.ih-eu-mda1.nimbus.holesky.yml b/ansible/host_vars/windows-01.ih-eu-mda1.nimbus.holesky.yml new file mode 100644 index 0000000..5c62129 --- /dev/null +++ b/ansible/host_vars/windows-01.ih-eu-mda1.nimbus.holesky.yml @@ -0,0 +1,2 @@ +--- +beacon_node_exec_layer_urls: ['http://holesky-02.ih-eu-mda1.nimbus.geth.wg:{{ 8551 + (idx|int) }}'] diff --git a/ansible/inventory/test b/ansible/inventory/test index 0c5a72c..0d7239a 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -54,6 +54,7 @@ node-01.aws-eu-central-1a.dash.nimbus hostname=node-01.aws-eu-central-1a.dash.ni store-01.he-eu-hel1.logs.nimbus hostname=store-01.he-eu-hel1.logs.nimbus ansible_host=65.108.226.62 env=logs stage=nimbus data_center=he-eu-hel1 region=eu-hel1 dns_entry=store-01.he-eu-hel1.logs.nimbus.status.im store-02.he-eu-hel1.logs.nimbus hostname=store-02.he-eu-hel1.logs.nimbus ansible_host=65.109.62.247 env=logs stage=nimbus data_center=he-eu-hel1 region=eu-hel1 dns_entry=store-02.he-eu-hel1.logs.nimbus.status.im store-03.he-eu-hel1.logs.nimbus hostname=store-03.he-eu-hel1.logs.nimbus ansible_host=65.109.49.101 env=logs stage=nimbus data_center=he-eu-hel1 region=eu-hel1 dns_entry=store-03.he-eu-hel1.logs.nimbus.status.im +windows-01.ih-eu-mda1.nimbus.holesky hostname=windows-01.ih-eu-mda1.nimbus.holesky ansible_host=194.33.40.240 env=nimbus stage=holesky data_center=ih-eu-mda1 region=eu-mda1 dns_entry=windows-01.ih-eu-mda1.nimbus.holesky.status.im [aws-eu-central-1a] bootstrap-01.aws-eu-central-1a.nimbus.mainnet @@ -116,6 +117,7 @@ neth-07.ih-eu-mda1.nimbus.holesky neth-08.ih-eu-mda1.nimbus.holesky neth-09.ih-eu-mda1.nimbus.holesky neth-10.ih-eu-mda1.nimbus.holesky +windows-01.ih-eu-mda1.nimbus.holesky [log-dash] node-01.aws-eu-central-1a.dash.nimbus @@ -178,6 +180,9 @@ neth-08.ih-eu-mda1.nimbus.holesky neth-09.ih-eu-mda1.nimbus.holesky neth-10.ih-eu-mda1.nimbus.holesky +[nimbus-holesky-windows] +windows-01.ih-eu-mda1.nimbus.holesky + [nimbus-mainnet-metal] linux-01.ih-eu-mda1.nimbus.mainnet linux-02.ih-eu-mda1.nimbus.mainnet @@ -242,6 +247,7 @@ neth-07.ih-eu-mda1.nimbus.holesky neth-08.ih-eu-mda1.nimbus.holesky neth-09.ih-eu-mda1.nimbus.holesky neth-10.ih-eu-mda1.nimbus.holesky +windows-01.ih-eu-mda1.nimbus.holesky [nimbus.mainnet] bootstrap-01.aws-eu-central-1a.nimbus.mainnet diff --git a/ansible/requirements.yml b/ansible/requirements.yml index d72ab07..a61d70e 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -50,7 +50,7 @@ - name: infra-role-beacon-node-windows src: git@github.com:status-im/infra-role-beacon-node-windows.git - version: 51bd279d0ffd26933057bff854a6c7b4ebb72ae3 + version: 462e2dc5e64f72772a5e5c93060c9dfd53fc7694 scm: git - name: infra-role-beacon-node-macos diff --git a/ansible/vars/layout/holesky.yml b/ansible/vars/layout/holesky.yml index d0201df..801e714 100644 --- a/ansible/vars/layout/holesky.yml +++ b/ansible/vars/layout/holesky.yml @@ -190,6 +190,12 @@ nodes_layout: - { branch: 'testing', build_start: '15:00:00' } - { branch: 'unstable', build_start: '17:00:00' } + # Windows ------------------------------------------------------------------------ + 'windows-01.ih-eu-mda1.nimbus.holesky': # 0 each + - { branch: 'stable', build_start: '13:00:00' } + - { branch: 'testing', build_start: '15:00:00' } + - { branch: 'unstable', build_start: '17:00:00' } + # Geth --------------------------------------------------------------------------- 'holesky-01.ih-eu-mda1.nimbus.geth': [{}, {}, {}] # For MacOS nodes. 'holesky-02.ih-eu-mda1.nimbus.geth': [{}, {}, {}] # For Windows nodes. (TODO) diff --git a/holesky.tf b/holesky.tf index 64c3a83..6e8dfed 100644 --- a/holesky.tf +++ b/holesky.tf @@ -85,6 +85,26 @@ module "nimbus_nodes_holesky_innova_macm2" { ] } +module "nimbus_nodes_holesky_innova_windows" { + source = "github.com/status-im/infra-tf-dummy-module" + + name = "windows" + env = "nimbus" + stage = "holesky" + group = "nimbus-holesky-windows" + region = "eu-mda1" + prefix = "ih" + + /* Windows */ + become_user = "admin" + become_method = "runas" + shell_type = "powershell" + + ips = [ + "194.33.40.240" # windows-01.ih-eu-mda1.nimbus.holesky + ] +} + /* Community test REST API endpoints. */ resource "cloudflare_record" "unstable_holesky_beacon_api" { zone_id = local.zones["nimbus.team"] diff --git a/outputs.tf b/outputs.tf index ac0d91f..ef8b5da 100644 --- a/outputs.tf +++ b/outputs.tf @@ -8,8 +8,9 @@ output "hosts" { module.nimbus_nodes_fluffy_innova.hosts, module.nimbus_nodes_holesky_innova_erigon.hosts, module.nimbus_nodes_holesky_innova_geth.hosts, - module.nimbus_nodes_holesky_innova_macm2.hosts, module.nimbus_nodes_holesky_innova_neth.hosts, + module.nimbus_nodes_holesky_innova_macm2.hosts, + module.nimbus_nodes_holesky_innova_windows.hosts, module.nimbus_nodes_mainnet_innova.hosts, module.nimbus_nodes_mainnet_stable_small.hosts, module.nimbus_nodes_prater_innova.hosts,