Networks changes to regions

resources/terraform/devnet/main.tf

@@ -146,10 +146,13 @@ module "devnet" {
   nr_api_key           = var.nr_api_key
   access_key           = var.access_key
   secret_key           = var.secret_key
+  aws_region           = var.aws_region
+  azs                  = var.azs
   vpc_id               = var.vpc_id
   instance_type        = var.instance_type
   vpc_cidr_block       = var.vpc_cidr_block
   public_subnet_cidrs  = var.public_subnet_cidrs
   pot_external_entropy = var.pot_external_entropy
+  private_key_path     = var.private_key_path
 
 }

resources/terraform/devnet/variables.tf

@@ -52,12 +52,6 @@ variable "vpc_cidr_block" {
   type = string
 }
 
-variable "azs" {
-  type        = string
-  description = "Availability Zones"
-  default     = "us-east-1a"
-}
-
 variable "instance_count" {
   type = map(number)
   default = {
@@ -76,7 +70,11 @@ variable "instance_count" {
 variable "aws_region" {
   description = "aws region"
   type        = list(string)
-  default     = ["us-east-1"]
+}
+
+variable "azs" {
+  type        = string
+  description = "Availability Zones"
 }
 
 variable "public_subnet_cidrs" {

resources/terraform/mainnet/main.tf

@@ -146,10 +146,13 @@ module "mainnet" {
   nr_api_key           = var.nr_api_key
   access_key           = var.access_key
   secret_key           = var.secret_key
+  aws_region           = var.aws_region
+  azs                  = var.azs
   vpc_id               = var.vpc_id
   instance_type        = var.instance_type
   vpc_cidr_block       = var.vpc_cidr_block
   public_subnet_cidrs  = var.public_subnet_cidrs
   pot_external_entropy = var.pot_external_entropy
+  private_key_path     = var.private_key_path
 
 }

resources/terraform/mainnet/variables.tf

@@ -52,18 +52,13 @@ variable "vpc_cidr_block" {
   type = string
 }
 
-variable "azs" {
-  type        = string
-  description = "Availability Zones"
-  default     = "us-west-1a"
-}
-
 variable "instance_count" {
   type = map(number)
   default = {
     bootstrap        = 0
-    rpc              = 0
+    rpc              = 2
     domain           = 4
+    autoid           = 0
     rpc-indexer      = 0
     auto-evm-indexer = 0
     farmer           = 0
@@ -75,13 +70,19 @@ variable "instance_count" {
 variable "aws_region" {
   description = "aws region"
   type        = list(string)
-  default     = ["us-west-2"]
+  default     = ["us-east-2"]
+}
+
+variable "azs" {
+  type        = string
+  description = "Availability Zones"
+  default     = "us-east-2a"
 }
 
 variable "public_subnet_cidrs" {
   type        = list(string)
   description = "Public Subnet CIDR values"
-  default     = ["172.35.1.0/24"]
+  default     = ["172.38.1.0/24"]
 }
 
 variable "disk_volume_size" {

resources/terraform/taurus/main.tf

@@ -142,13 +142,17 @@ module "taurus" {
 
   cloudflare_api_token = var.cloudflare_api_token
   cloudflare_email     = var.cloudflare_email
+  cloudflare_zone_id   = var.cloudflare_zone_id
   nr_api_key           = var.nr_api_key
   access_key           = var.access_key
   secret_key           = var.secret_key
+  aws_region           = var.aws_region
+  azs                  = var.azs
   vpc_id               = var.vpc_id
   instance_type        = var.instance_type
   vpc_cidr_block       = var.vpc_cidr_block
   public_subnet_cidrs  = var.public_subnet_cidrs
   pot_external_entropy = var.pot_external_entropy
+  private_key_path     = var.private_key_path
 
 }

resources/terraform/taurus/variables.tf

@@ -4,6 +4,12 @@ variable "network_name" {
   default     = "taurus"
 
 }
+
+variable "cloudflare_zone_id" {
+  description = "Cloudflare zone ID"
+  type        = string
+}
+
 variable "farmer_reward_address" {
   description = "Farmer's reward address"
   type        = string
@@ -46,37 +52,37 @@ variable "vpc_cidr_block" {
   type = string
 }
 
-variable "azs" {
-  type        = string
-  description = "Availability Zones"
-  default     = "us-east-1a"
-}
-
 variable "instance_count" {
   type = map(number)
   default = {
-    bootstrap        = 2
+    bootstrap        = 0
     rpc              = 2
-    domain           = 0
-    autoid           = 0
-    rpc-indexer      = 1
+    domain           = 2
+    autoid           = 2
+    rpc-indexer      = 0
     auto-evm-indexer = 0
-    farmer           = 1
-    evm_bootstrap    = 0
-    autoid_bootstrap = 0
+    farmer           = 0
+    evm_bootstrap    = 1
+    autoid_bootstrap = 1
   }
 }
 
 variable "aws_region" {
   description = "aws region"
   type        = list(string)
-  default     = ["us-east-1"]
+  default     = ["us-west-2"]
+}
+
+variable "azs" {
+  type        = string
+  description = "Availability Zones"
+  default     = "us-west-2a"
 }
 
 variable "public_subnet_cidrs" {
   type        = list(string)
   description = "Public Subnet CIDR values"
-  default     = ["172.35.1.0/24"]
+  default     = ["172.39.1.0/24"]
 }
 
 variable "disk_volume_size" {

templates/scripts/create_domain_node_compose_file.sh

@@ -176,7 +176,9 @@ if [ "${enable_domains}" == "true" ]; then
       echo '      "--trie-cache-size", "1073741824",'
     fi
     for (( i = 0; i < node_count; i++ )); do
-      echo "      \"--operator-id\", \"${i}\"," >> ~/subspace/docker-compose.yml
+      if [ "${current_node}" == "${i}" ]; then
+        echo "      \"--operator-id\", \"${i}\"," >> ~/subspace/docker-compose.yml
+      fi
     done
     echo '      "--listen-on", "/ip4/0.0.0.0/tcp/30334",'
     echo '      "--listen-on", "/ip6/::/tcp/30334",'

templates/scripts/installer.sh

@@ -24,4 +24,4 @@ fi
 
 sudo sysctl -p /etc/sysctl.conf
 
-sudo docker plugin install grafana/loki-docker-driver:2.9.1 --alias loki --grant-all-permissions
+sudo docker plugin install grafana/loki-docker-driver:latest --alias loki --grant-all-permissions

templates/terraform/network-primitives/variables.tf

@@ -34,12 +34,6 @@ variable "vpc_cidr_block" {
   type = string
 }
 
-variable "azs" {
-  type        = string
-  description = "Availability Zones"
-  default     = "us-east-1a"
-}
-
 variable "instance_count" {
   type = map(number)
   default = {
@@ -56,7 +50,11 @@ variable "instance_count" {
 variable "aws_region" {
   description = "aws region"
   type        = list(string)
-  default     = ["us-east-1"]
+}
+
+variable "azs" {
+  type        = string
+  description = "Availability Zones"
 }
 
 variable "public_subnet_cidrs" {
@@ -80,8 +78,7 @@ variable "ssh_user" {
 }
 
 variable "private_key_path" {
-  type    = string
-  default = "~/.ssh/deployer.pem"
+  type = string
 }
 
 variable "network_name" {