diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 5bca266..065bb3c 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -151,6 +151,12 @@ nodes_layout: - { branch: 'testing', start: 16000, end: 18000, build_start: '15:00:00' } - { branch: 'unstable', start: 18000, end: 20000, build_start: '16:00:00', nim_flags: '-d:json_rpc_websocket_package=websock' } + 'linux-01.cs-eu-nld1.nimbus.prater': # 0 each + - { branch: 'stable', build_freq: '*-*-* 13:00:00' } + - { branch: 'testing', build_freq: '*-*-* 15:00:00', nim_commit: 'version-1-6' } + - { branch: 'unstable', build_freq: '*-*-* 17:00:00', public_api: true } + - { branch: 'libp2p', build_freq: '*-*-* 19:00:00' } + 'linux-01.he-eu-hel1.nimbus.prater': # 0 each - { branch: 'stable', build_freq: '*-*-* 13:00:00' } - { branch: 'testing', build_freq: '*-*-* 15:00:00', nim_commit: 'version-1-6' } diff --git a/ansible/host_vars/linux-01.cs-eu-nld1.nimbus.prater.yml b/ansible/host_vars/linux-01.cs-eu-nld1.nimbus.prater.yml new file mode 100644 index 0000000..019261f --- /dev/null +++ b/ansible/host_vars/linux-01.cs-eu-nld1.nimbus.prater.yml @@ -0,0 +1,7 @@ +--- +# CtrlServ4ers has no dedicated Consul Cluster +bootstrap__consul_data_center: 'he-eu-hel1' +# Volumes +bootstrap__extra_volume_bind_paths: + DATA_VOLUME1: ['/data'] + DATA_VOLUME2: ['/docker'] diff --git a/ansible/inventory/test b/ansible/inventory/test index a57c346..85902d4 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -4,6 +4,7 @@ goerli-01.he-eu-hel1.nimbus.geth hostname=goerli-01.he-eu-hel1.nimbus.geth ansible_host=65.21.73.183 env=nimbus stage=geth data_center=he-eu-hel1 region=eu-hel1 dns_entry=goerli-01.he-eu-hel1.nimbus.geth.statusim.net goerli-02.he-eu-hel1.nimbus.geth hostname=goerli-02.he-eu-hel1.nimbus.geth ansible_host=65.21.196.48 env=nimbus stage=geth data_center=he-eu-hel1 region=eu-hel1 dns_entry=goerli-02.he-eu-hel1.nimbus.geth.statusim.net goerli-03.he-eu-hel1.nimbus.geth hostname=goerli-03.he-eu-hel1.nimbus.geth ansible_host=65.21.196.47 env=nimbus stage=geth data_center=he-eu-hel1 region=eu-hel1 dns_entry=goerli-03.he-eu-hel1.nimbus.geth.statusim.net +linux-01.cs-eu-nld1.nimbus.prater hostname=linux-01.cs-eu-nld1.nimbus.prater ansible_host=95.168.165.2 env=nimbus stage=prater data_center=cs-eu-nld1 region=eu-nld1 dns_entry=linux-01.cs-eu-nld1.nimbus.prater.statusim.net linux-01.he-eu-hel1.nimbus.prater hostname=linux-01.he-eu-hel1.nimbus.prater ansible_host=95.217.198.113 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-01.he-eu-hel1.nimbus.prater.statusim.net linux-01.he-eu-hel1.nimbus.sepolia hostname=linux-01.he-eu-hel1.nimbus.sepolia ansible_host=65.21.89.157 env=nimbus stage=sepolia data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-01.he-eu-hel1.nimbus.sepolia.statusim.net linux-02.he-eu-hel1.nimbus.prater hostname=linux-02.he-eu-hel1.nimbus.prater ansible_host=95.217.230.20 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-02.he-eu-hel1.nimbus.prater.statusim.net @@ -43,6 +44,9 @@ stable-small-02.aws-eu-central-1a.nimbus.mainnet testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater +[cs-eu-nld1] +linux-01.cs-eu-nld1.nimbus.prater + [dash.nimbus] node-01.aws-eu-central-1a.dash.nimbus @@ -115,6 +119,7 @@ stable-small-02.aws-eu-central-1a.nimbus.mainnet macos-01.ms-eu-dublin.nimbus.prater [nimbus-prater-metal] +linux-01.cs-eu-nld1.nimbus.prater linux-01.he-eu-hel1.nimbus.prater linux-02.he-eu-hel1.nimbus.prater linux-03.he-eu-hel1.nimbus.prater @@ -162,6 +167,7 @@ stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet [nimbus.prater] +linux-01.cs-eu-nld1.nimbus.prater linux-01.he-eu-hel1.nimbus.prater linux-02.he-eu-hel1.nimbus.prater linux-03.he-eu-hel1.nimbus.prater diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 4f5a544..54cc3a7 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -16,7 +16,7 @@ - name: infra-role-bootstrap-linux src: git@github.com:status-im/infra-role-bootstrap-linux.git - version: 45ecfc30c0bb603d58140fc9abfe372b6343c874 + version: 9cbaa6c4fed4ecadce7c1ba0bbfbd9b57522cc9e scm: git - name: infra-role-bootstrap-windows @@ -26,7 +26,7 @@ - name: infra-role-bootstrap-macos src: git@github.com:status-im/infra-role-bootstrap-macos.git - version: be4188636c7d73bf16a3e0ab257afeb1d85c9078 + version: 4ad699edd09e60032d588bfc4eb26059c62281b7 scm: git - name: infra-role-wireguard @@ -51,7 +51,7 @@ - name: infra-role-beacon-node-windows src: git@github.com:status-im/infra-role-beacon-node-windows.git - version: e9afc5d21058378216afb3dbda3cf1f832bb2db7 + version: 224ebafabab91716b0fcd78d7d155f7d1bb00883 scm: git - name: infra-role-beacon-node-macos diff --git a/prater.tf b/prater.tf index 5b4c828..e2bcc87 100644 --- a/prater.tf +++ b/prater.tf @@ -130,6 +130,23 @@ module "nimbus_nodes_prater_hetzner" { ] } +/* Possible future alternative to Hetzner */ +module "nimbus_nodes_prater_ctrl_servers" { + source = "github.com/status-im/infra-tf-dummy-module" + + name = "linux" + env = "nimbus" + stage = "prater" + group = "nimbus-prater-metal" + region = "eu-nld1" + prefix = "cs" + domain = var.domain + + ips = [ + "95.168.165.2", # linux-01.cs-eu-nld1.nimbus.prater + ] +} + /* Community test REST API endpoints. */ resource "cloudflare_record" "unstable_prater_beacon_api" { zone_id = local.zones["nimbus.team"]