Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions resources/leaseweb/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module "network" {
deployment-version = 1
instance-count = var.instance_count["bootstrap"]
repo-org = "autonomys"
node-tag = "bootstrap-node"
docker-tag = "bootstrap-node"
additional-node-ips = var.additional_node_ips["bootstrap"]
reserved-only = true
prune = false
Expand All @@ -20,7 +20,7 @@ module "network" {
deployment-version = 1
instance-count = var.instance_count["bootstrap"]
repo-org = "autonomys"
node-tag = "bootstrap-node"
docker-tag = "bootstrap-node"
additional-node-ips = var.additional_node_ips["bootstrap"]
reserved-only = true
prune = false
Expand All @@ -34,7 +34,7 @@ module "network" {
deployment-version = 1
instance-count = var.instance_count["node"]
repo-org = "autonomys"
node-tag = "subspace-node"
docker-tag = "subspace-node"
additional-node-ips = var.additional_node_ips["node"]
reserved-only = true
prune = false
Expand All @@ -45,7 +45,7 @@ module "network" {
deployment-version = 1
instance-count = var.instance_count["domain"]
repo-org = "autonomys"
node-tag = "subspace-node"
docker-tag = "subspace-node"
additional-node-ips = var.additional_node_ips["domain"]
domain-prefix = "domain"
reserved-only = true
Expand All @@ -60,7 +60,7 @@ module "network" {
deployment-version = 1
instance-count = var.instance_count["farmer"]
repo-org = "autonomys"
node-tag = "farmer-node"
docker-tag = "farmer-node"
additional-node-ips = var.additional_node_ips["farmer"]
reserved-only = true
prune = false
Expand Down
26 changes: 13 additions & 13 deletions scripts/launch-nodes/manage_subspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def main():
with open(args.config, 'rb') as f:
config = tomli.load(f)

bootstrap_node = config['bootstrap_node']
bootstrap_nodes = [bootstrap_node for bootstrap_node in config['bootstrap_nodes']]
farmer_nodes = [node for node in config['farmer_rpc_nodes'] if node['type'] == 'farmer']
rpc_nodes = [node for node in config['farmer_rpc_nodes'] if node['type'] == 'rpc']
timekeeper_node = config['timekeeper']
Expand Down Expand Up @@ -281,19 +281,19 @@ def main():
client.close()

# Step 4: Handle the bootstrap node with genesis hash from arguments
try:
logger.info(f"Connecting to the bootstrap node {bootstrap_node['host']}...")
client = ssh_connect(bootstrap_node['host'], bootstrap_node['user'], bootstrap_node['ssh_key'])

handle_node(client, bootstrap_node, args.subspace_dir, args.release_version,
pot_external_entropy=args.pot_external_entropy, network=args.network,
prune=args.prune, restart=args.restart,
genesis_hash=args.genesis_hash)
for bootstrap_node in config['bootstrap_nodes']:
try:
logger.info(f"Connecting to the bootstrap node {bootstrap_node['host']}...")
client = ssh_connect(bootstrap_node['host'], bootstrap_node['user'], bootstrap_node['ssh_key'])

except Exception as e:
logger.error(f"Error handling bootstrap node: {e}")
finally:
if client:
handle_node(client, bootstrap_node, args.subspace_dir, args.release_version,
pot_external_entropy=args.pot_external_entropy, network=args.network,
prune=args.prune, restart=args.restart,
genesis_hash=args.genesis_hash)
except Exception as e:
logger.error(f"Error handling bootstrap node {bootstrap_node['host']}: {e}")
finally:
if client:
client.close()

if __name__ == '__main__':
Expand Down
26 changes: 21 additions & 5 deletions scripts/launch-nodes/nodes.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
# TOML file containing server details

[bootstrap_node]
[[bootstrap_nodes]]
host = "34.201.40.91"
user = "ubuntu"
user = "user"
ssh_key = "key.pem"

[[bootstrap_nodes]]
host = "35.202.41.92"
user = "user"
ssh_key = "key.pem"

[[bootstrap_nodes]]
host = "36.203.42.93"
user = "user"
ssh_key = "key.pem"

[[farmer_rpc_nodes]]
host = "54.209.76.129"
user = "user"
ssh_key = "key.pem"
type = "rpc"

[[farmer_rpc_nodes]]
host = "54.209.76.129"
user = "ubuntu"
user = "user"
ssh_key = "key.pem"
type = "rpc"

[[farmer_rpc_nodes]]
host = "44.202.161.154"
user = "ubuntu"
user = "user"
ssh_key = "key.pem"
type = "farmer"

[timekeeper]
host = "54.147.124.232"
user = "ubuntu"
user = "user"
ssh_key = "key.pem"
type = "timekeeper"
4 changes: 2 additions & 2 deletions templates/scripts/create_bootstrap_node_compose_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
restart: unless-stopped

dsn-bootstrap-node:
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${DOCKER_TAG}
restart: unless-stopped
environment:
- RUST_LOG=info
Expand Down Expand Up @@ -104,7 +104,7 @@ done

cat >> ~/subspace/docker-compose.yml << EOF
archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
restart: unless-stopped
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
restart: unless-stopped

dsn-bootstrap-node:
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${DOCKER_TAG}
restart: unless-stopped
environment:
- RUST_LOG=info
Expand Down Expand Up @@ -103,7 +103,7 @@ done

cat >> ~/subspace/docker-compose.yml << EOF
archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion templates/scripts/create_domain_node_compose_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:
- ./acme.json:/acme.json

archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
- ./keystore:/var/subspace/keystore:ro
Expand Down
4 changes: 2 additions & 2 deletions templates/scripts/create_farmer_node_compose_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
depends_on:
archival-node:
condition: service_healthy
image: ghcr.io/\${NODE_ORG}/farmer:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/farmer:\${DOCKER_TAG}
volumes:
- /home/$USER/subspace/farmer_data:/var/subspace:rw
restart: unless-stopped
Expand All @@ -72,7 +72,7 @@ services:
]

archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion templates/scripts/create_rpc_node_compose_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ services:
- ./acme.json:/acme.json

archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
restart: unless-stopped
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ resource "null_resource" "start-bootstrap-nodes-domain" {

# create .env file
"echo NODE_ORG=${var.bootstrap-node-domain-config.repo-org} > /root/subspace/.env",
"echo NODE_TAG=${var.bootstrap-node-domain-config.node-tag} >> /root/subspace/.env",
"echo DOCKER_TAG=${var.bootstrap-node-domain-config.docker-tag} >> /root/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /root/subspace/.env",
"echo NODE_ID=${count.index} >> /root/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /root/subspace/node_keys.txt) >> /root/subspace/.env",
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/leaseweb/bootstrap_node_provisioner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ resource "null_resource" "start-boostrap-nodes" {

# create .env file
"echo REPO_ORG=${var.bootstrap-node-config.repo-org} > /root/subspace/.env",
"echo NODE_TAG=${var.bootstrap-node-config.node-tag} >> /root/subspace/.env",
"echo DOCKER_TAG=${var.bootstrap-node-config.docker-tag} >> /root/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /root/subspace/.env",
"echo NODE_ID=${count.index} >> /root/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /root/subspace/node_keys.txt) >> /root/subspace/.env",
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/leaseweb/domain_node_provisioner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ resource "null_resource" "start-domain-nodes" {

# create .env file
"echo REPO_ORG=${var.domain-node-config.repo-org} > /root/subspace/.env",
"echo NODE_TAG=${var.domain-node-config.node-tag} >> /root/subspace/.env",
"echo DOCKER_TAG=${var.domain-node-config.docker-tag} >> /root/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /root/subspace/.env",
"echo DOMAIN_PREFIX=${var.domain-node-config.domain-prefix[0]} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_LABEL=${var.domain-node-config.domain-labels[0]} >> /home/${var.ssh_user}/subspace/.env",
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/leaseweb/farmer_node_provisioner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ resource "null_resource" "start-farmer-nodes" {

# create .env file
"echo REPO_ORG=${var.farmer-node-config.repo-org} > /root/subspace/.env",
"echo NODE_TAG=${var.farmer-node-config.node-tag} >> /root/subspace/.env",
"echo DOCKER_TAG=${var.farmer-node-config.docker-tag} >> /root/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /root/subspace/.env",
"echo NODE_ID=${count.index} >> /root/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /root/subspace/node_keys.txt) >> /root/subspace/.env",
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/leaseweb/node_provisioner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ resource "null_resource" "start-nodes" {

# create .env file
"echo REPO_ORG=${var.node-config.repo-org} > /root/subspace/.env",
"echo NODE_TAG=${var.node-config.node-tag} >> /root/subspace/.env",
"echo DOCKER_TAG=${var.node-config.docker-tag} >> /root/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /root/subspace/.env",
"echo NODE_ID=${count.index} >> /root/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /root/subspace/node_keys.txt) >> /root/subspace/.env",
Expand Down
10 changes: 5 additions & 5 deletions templates/terraform/leaseweb/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ variable "node-config" {
deployment-version = number
instance-count = number
repo-org = string
node-tag = string
docker-tag = string
additional-node-ips = list(string)
reserved-only = bool
prune = bool
Expand All @@ -28,7 +28,7 @@ variable "domain-node-config" {
deployment-version = number
instance-count = number
repo-org = string
node-tag = string
docker-tag = string
additional-node-ips = list(string)
domain-prefix = list(string)
reserved-only = bool
Expand All @@ -46,7 +46,7 @@ variable "bootstrap-node-config" {
deployment-version = number
instance-count = number
repo-org = string
node-tag = string
docker-tag = string
additional-node-ips = list(string)
reserved-only = bool
prune = bool
Expand All @@ -62,7 +62,7 @@ variable "bootstrap-node-domain-config" {
deployment-version = number
instance-count = number
repo-org = string
node-tag = string
docker-tag = string
additional-node-ips = list(string)
reserved-only = bool
prune = bool
Expand All @@ -79,7 +79,7 @@ variable "farmer-node-config" {
deployment-version = number
instance-count = number
repo-org = string
node-tag = string
docker-tag = string
additional-node-ips = list(string)
reserved-only = bool
prune = bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "null_resource" "start-autoid-nodes" {

# create .env file
"echo NODE_ORG=${var.domain-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.domain-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.domain-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_PREFIX=${var.domain-node-config.domain-prefix[0]} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_LABEL=${var.domain-node-config.domain-labels[1]} >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ resource "null_resource" "start-bootstrap-nodes-autoid" {

# create .env file
"echo NODE_ORG=${var.bootstrap-node-autoid-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.bootstrap-node-autoid-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.bootstrap-node-autoid-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /home/${var.ssh_user}/subspace/node_keys.txt) >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ resource "null_resource" "start-bootstrap-nodes-evm" {

# create .env file
"echo NODE_ORG=${var.bootstrap-node-evm-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.bootstrap-node-evm-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.bootstrap-node-evm-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /home/${var.ssh_user}/subspace/node_keys.txt) >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ resource "null_resource" "start-boostrap-nodes" {

# create .env file
"echo NODE_ORG=${var.bootstrap-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.bootstrap-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.bootstrap-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /home/${var.ssh_user}/subspace/node_keys.txt) >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "null_resource" "start-domain-nodes" {

# create .env file
"echo NODE_ORG=${var.domain-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.domain-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.domain-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_PREFIX=${var.domain-node-config.domain-prefix[0]} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_LABEL=${var.domain-node-config.domain-labels[0]} >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ resource "null_resource" "start-farmer-nodes" {

# create .env file
"echo NODE_ORG=${var.farmer-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.farmer-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.farmer-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_KEY=$(sed -nr 's/NODE_${count.index}_KEY=//p' /home/${var.ssh_user}/subspace/node_keys.txt) >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ resource "null_resource" "start-nova-squid-nodes" {

# create .env file
"echo NODE_ORG=${var.nova-squid-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.nova-squid-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.nova-squid-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_PREFIX=${var.nova-squid-node-config.domain-prefix} >> /home/${var.ssh_user}/subspace/.env",
# //todo use a map for domain id and labels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ resource "null_resource" "start-rpc-nodes" {

# create .env file
"echo NODE_ORG=${var.rpc-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.rpc-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.rpc-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_PREFIX=${var.rpc-node-config.domain-prefix} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ resource "null_resource" "start-rpc-squid-nodes" {

# create .env file
"echo NODE_ORG=${var.rpc-squid-node-config.docker-org} > /home/${var.ssh_user}/subspace/.env",
"echo NODE_TAG=${var.rpc-squid-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo DOCKER_TAG=${var.rpc-squid-node-config.docker-tag} >> /home/${var.ssh_user}/subspace/.env",
"echo NETWORK_NAME=${var.network_name} >> /home/${var.ssh_user}/subspace/.env",
"echo DOMAIN_PREFIX=${var.rpc-squid-node-config.domain-prefix} >> /home/${var.ssh_user}/subspace/.env",
"echo NODE_ID=${count.index} >> /home/${var.ssh_user}/subspace/.env",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
restart: unless-stopped

dsn-bootstrap-node:
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/bootstrap-node:\${DOCKER_TAG}
restart: unless-stopped
environment:
- RUST_LOG=info
Expand Down Expand Up @@ -104,7 +104,7 @@ done

cat >> ~/subspace/docker-compose.yml << EOF
archival-node:
image: ghcr.io/\${NODE_ORG}/node:\${NODE_TAG}
image: ghcr.io/\${NODE_ORG}/node:\${DOCKER_TAG}
volumes:
- archival_node_data:/var/subspace:rw
restart: unless-stopped
Expand Down
Loading