From 9e36f7f376652623db6c3cd7ecbcb3fce6002c17 Mon Sep 17 00:00:00 2001 From: DaMandal0rian Date: Thu, 18 Jul 2024 22:50:25 +0300 Subject: [PATCH] change prefix --- resources/gemini-3h/main.tf | 3 ++- templates/scripts/create_domain_node_compose_file.sh | 2 +- templates/scripts/create_rpc_node_compose_file.sh | 2 +- .../terraform/network-primitives/domain_node_provisioner.tf | 2 -- .../network-primitives/nova_squid_node_provisioner.tf | 2 -- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/resources/gemini-3h/main.tf b/resources/gemini-3h/main.tf index 946c5baf..9589c395 100644 --- a/resources/gemini-3h/main.tf +++ b/resources/gemini-3h/main.tf @@ -43,6 +43,7 @@ module "gemini-3h" { instance-count = var.instance_count["rpc-squid"] docker-org = "subspace" docker-tag = "gemini-3h-2024-jul-16" + domain-prefix = "rpc-squid" reserved-only = false prune = false node-dsn-port = 30433 @@ -50,7 +51,7 @@ module "gemini-3h" { disk-volume-type = var.disk_volume_type } - domain-node-config = { + nova-squid-node-config = { instance-type = var.instance_type["nova-squid"] deployment-version = 0 regions = var.aws_region diff --git a/templates/scripts/create_domain_node_compose_file.sh b/templates/scripts/create_domain_node_compose_file.sh index 8bd96b3b..0ae9a8f2 100755 --- a/templates/scripts/create_domain_node_compose_file.sh +++ b/templates/scripts/create_domain_node_compose_file.sh @@ -42,7 +42,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock" environment: NRIA_LICENSE_KEY: "\${NR_API_KEY}" - NRIA_DISPLAY_NAME: "\${NETWORK_NAME}-domain-node-\${NODE_ID}" + NRIA_DISPLAY_NAME: "\${NETWORK_NAME}-\${DOMAIN_PREFIX}-node-\${NODE_ID}" restart: unless-stopped # traefik reverse proxy with automatic tls management using let encrypt diff --git a/templates/scripts/create_rpc_node_compose_file.sh b/templates/scripts/create_rpc_node_compose_file.sh index 24fcc942..3b6ac2c7 100755 --- a/templates/scripts/create_rpc_node_compose_file.sh +++ b/templates/scripts/create_rpc_node_compose_file.sh @@ -42,7 +42,7 @@ services: - "/var/run/docker.sock:/var/run/docker.sock" environment: NRIA_LICENSE_KEY: "\${NR_API_KEY}" - NRIA_DISPLAY_NAME: "\${NETWORK_NAME}-rpc-node-\${NODE_ID}" + NRIA_DISPLAY_NAME: "\${NETWORK_NAME}-\${DOMAIN_PREFIX}-node-\${NODE_ID}" restart: unless-stopped # traefik reverse proxy with automatic tls management using let encrypt diff --git a/templates/terraform/network-primitives/domain_node_provisioner.tf b/templates/terraform/network-primitives/domain_node_provisioner.tf index fbaefb1c..39b65de4 100644 --- a/templates/terraform/network-primitives/domain_node_provisioner.tf +++ b/templates/terraform/network-primitives/domain_node_provisioner.tf @@ -176,8 +176,6 @@ resource "null_resource" "start-domain-nodes" { "echo DOMAIN_ID=${var.domain-node-config.domain-id[0]} >> /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", - "echo RELAYER_SYSTEM_ID=$(sed -nr 's/NODE_${count.index}_RELAYER_SYSTEM_ID=//p' /home/${var.ssh_user}/subspace/relayer_ids.txt) >> /home/${var.ssh_user}/subspace/.env", - "echo RELAYER_DOMAIN_ID=$(sed -nr 's/NODE_${count.index}_RELAYER_DOMAIN_ID=//p' /home/${var.ssh_user}/subspace/relayer_ids.txt) >> /home/${var.ssh_user}/subspace/.env", "echo NR_API_KEY=${var.nr_api_key} >> /home/${var.ssh_user}/subspace/.env", "echo PIECE_CACHE_SIZE=${var.piece_cache_size} >> /home/${var.ssh_user}/subspace/.env", "echo NODE_DSN_PORT=${var.domain-node-config.node-dsn-port} >> /home/${var.ssh_user}/subspace/.env", diff --git a/templates/terraform/network-primitives/nova_squid_node_provisioner.tf b/templates/terraform/network-primitives/nova_squid_node_provisioner.tf index 4e86b574..f6c20015 100644 --- a/templates/terraform/network-primitives/nova_squid_node_provisioner.tf +++ b/templates/terraform/network-primitives/nova_squid_node_provisioner.tf @@ -176,8 +176,6 @@ resource "null_resource" "start-nova-squid-nodes" { "echo DOMAIN_ID=${var.nova-squid-node-config.nova-squid-id[0]} >> /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", - "echo RELAYER_SYSTEM_ID=$(sed -nr 's/NODE_${count.index}_RELAYER_SYSTEM_ID=//p' /home/${var.ssh_user}/subspace/relayer_ids.txt) >> /home/${var.ssh_user}/subspace/.env", - "echo RELAYER_DOMAIN_ID=$(sed -nr 's/NODE_${count.index}_RELAYER_DOMAIN_ID=//p' /home/${var.ssh_user}/subspace/relayer_ids.txt) >> /home/${var.ssh_user}/subspace/.env", "echo NR_API_KEY=${var.nr_api_key} >> /home/${var.ssh_user}/subspace/.env", "echo PIECE_CACHE_SIZE=${var.piece_cache_size} >> /home/${var.ssh_user}/subspace/.env", "echo NODE_DSN_PORT=${var.nova-squid-node-config.node-dsn-port} >> /home/${var.ssh_user}/subspace/.env",