rename primary/secondary to 1/2

Author: JuArce

infra/aggregation_mode/ansible/README.md

@@ -20,7 +20,7 @@ The Ansible automation deploys a complete aggregation mode stack consisting of:
 
 1. **PostgreSQL Auto-Failover Cluster** (3 servers)
    - 1 Monitor node (EC2)
-   - 2 Data nodes (Primary + Secondary) with automatic failover (Scaleway Elastic Metal)
+   - 2 Data nodes with automatic failover (Scaleway Elastic Metal)
    - Password authentication with scram-sha-256
 
 2. **Gateway Service** (2 servers)
@@ -51,15 +51,15 @@ The Ansible automation deploys a complete aggregation mode stack consisting of:
 ├─────────────────────────────────────────────────────────────────┤
 │                                                                 │
 │  ┌──────────────┐  ┌──────────────┐  ┌──────────────┐           │
-│  │  PG Monitor  │  │ PG Primary   │  │ PG Secondary │           │
+│  │  PG Monitor  │  │ PG Node 1   │  │ PG Node 2 │           │
 │  │   (EC2)      │  │  (Scaleway)  │  │  (Scaleway)  │           │
 │  └──────┬───────┘  └──────┬───────┘  └──────┬───────┘           │
 │         │                  │                  │                 │
 │         └──────────────────┴──────────────────┘                 │
 │                    pg_auto_failover                             │
 │                                                                 │
 │  ┌────────────────────────┐  ┌────────────────────────┐         │
-│  │  Gateway Primary       │  │  Gateway Secondary     │         │
+│  │  Gateway 1       │  │  Gateway 2     │         │
 │  │  ├─ Gateway (8080+443)│  │  ├─ Gateway (8080+443) │         │
 │  │  └─ Poller            │  │  └─ Poller             │         │
 │  └────────────────────────┘  └────────────────────────┘         │
@@ -152,7 +152,7 @@ make agg_mode_deploy_all ENV=mainnet
 ```
 
 This will:
-1. Deploy PostgreSQL cluster (monitor, primary, secondary)
+1. Deploy PostgreSQL cluster (monitor, node 1, node 2)
 2. Run database migrations
 3. Deploy gateway and poller on both servers
 4. Deploy Prometheus and Grafana
@@ -175,7 +175,7 @@ make postgres_deploy ENV=mainnet
 This will:
 - Deploy monitor with scram-sha-256 auth
 - Set password for autoctl_node user
-- Deploy primary and secondary nodes
+- Deploy node 1 and node 2
 - Configure replication with password auth
 - Run database migrations
 
@@ -202,14 +202,14 @@ node_2    |   3   | 100.x.x.x:5432     |      1: 0/...  | read-only    | seconda
 ```bash
 # For Hoodi
 make gateway_deploy ENV=hoodi
-make gateway_primary_deploy ENV=hoodi
-make gateway_secondary_deploy ENV=hoodi
+make gateway_1_deploy ENV=hoodi
+make gateway_2_deploy ENV=hoodi
 make gateway_deploy ENV=hoodi FORCE_REBUILD=true
 
 # For Mainnet
 make gateway_deploy ENV=mainnet
-make gateway_primary_deploy ENV=mainnet
-make gateway_secondary_deploy ENV=mainnet
+make gateway_1_deploy ENV=mainnet
+make gateway_2_deploy ENV=mainnet
 make gateway_deploy ENV=mainnet FORCE_REBUILD=true
 ```
 
@@ -313,13 +313,13 @@ Force rebuild always rebuilds binaries from the latest code, even if they alread
 ```bash
 # For Hoodi
 make gateway_deploy ENV=hoodi FORCE_REBUILD=true
-make gateway_primary_deploy ENV=hoodi FORCE_REBUILD=true
-make gateway_secondary_deploy ENV=hoodi FORCE_REBUILD=true
+make gateway_1_deploy ENV=hoodi FORCE_REBUILD=true
+make gateway_2_deploy ENV=hoodi FORCE_REBUILD=true
 
 # For Mainnet
 make gateway_deploy ENV=mainnet FORCE_REBUILD=true
-make gateway_primary_deploy ENV=mainnet FORCE_REBUILD=true
-make gateway_secondary_deploy ENV=mainnet FORCE_REBUILD=true
+make gateway_1_deploy ENV=mainnet FORCE_REBUILD=true
+make gateway_2_deploy ENV=mainnet FORCE_REBUILD=true
 ```
 
 This will:
@@ -838,26 +838,26 @@ ansible-playbook infra/aggregation_mode/ansible/playbooks/pg_monitor.yaml \
 # Deploy only gateway (no poller) - Hoodi
 ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
   -i infra/aggregation_mode/ansible/hoodi-inventory.yaml \
-  -e "host=gateway_primary" \
+  -e "host=gateway_1" \
   -e "env=hoodi"
 
 # Deploy only gateway (no poller) - Mainnet
 ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
   -i infra/aggregation_mode/ansible/mainnet-inventory.yaml \
-  -e "host=gateway_primary" \
+  -e "host=gateway_1" \
   -e "env=mainnet"
 
 # Deploy gateway with forced rebuild (Hoodi)
 ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
   -i infra/aggregation_mode/ansible/hoodi-inventory.yaml \
-  -e "host=gateway_primary" \
+  -e "host=gateway_1" \
   -e "env=hoodi" \
   -e "force_rebuild=true"
 
 # Deploy gateway with forced rebuild (Mainnet)
 ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
   -i infra/aggregation_mode/ansible/mainnet-inventory.yaml \
-  -e "host=gateway_primary" \
+  -e "host=gateway_1" \
   -e "env=mainnet" \
   -e "force_rebuild=true"
 ```

infra/aggregation_mode/ansible/hoodi-inventory.yaml

@@ -7,17 +7,17 @@ postgres_monitor:
       ansible_user: admin
       ansible_python_interpreter: /usr/bin/python3
 
-# PostgreSQL Primary
-postgres_primary:
+# PostgreSQL Node 1
+postgres_1:
   hosts:
     agg-mode-hoodi-postgres-1:
       ansible_host: agg-mode-hoodi-postgres-1
       admin_user: admin
       ansible_user: admin
       ansible_python_interpreter: /usr/bin/python3
 
-# PostgreSQL Secondary
-postgres_secondary:
+# PostgreSQL Node 2
+postgres_2:
   hosts:
     agg-mode-hoodi-postgres-2:
       ansible_host: agg-mode-hoodi-postgres-2
@@ -29,20 +29,20 @@ postgres_secondary:
 postgres_cluster:
   children:
     postgres_monitor:
-    postgres_primary:
-    postgres_secondary:
+    postgres_1:
+    postgres_2:
 
-# Gateway Primary
-gateway_primary:
+# Gateway Node 1
+gateway_1:
   hosts:
     agg-mode-hoodi-gateway-1:
       ansible_host: agg-mode-hoodi-gateway-1
       admin_user: admin
       ansible_user: app
       ansible_python_interpreter: /usr/bin/python3
 
-# Gateway Secondary
-gateway_secondary:
+# Gateway Node 2
+gateway_2:
   hosts:
     agg-mode-hoodi-gateway-2:
       ansible_host: agg-mode-hoodi-gateway-2
@@ -53,8 +53,8 @@ gateway_secondary:
 # Gateway Cluster (all gateway nodes)
 gateway_cluster:
   children:
-    gateway_primary:
-    gateway_secondary:
+    gateway_1:
+    gateway_2:
 
 # Metrics Server
 metrics:

infra/aggregation_mode/ansible/mainnet-inventory.yaml

@@ -7,17 +7,17 @@ postgres_monitor:
       ansible_user: admin
       ansible_python_interpreter: /usr/bin/python3
 
-# PostgreSQL Primary
-postgres_primary:
+# PostgreSQL Node 1
+postgres_1:
   hosts:
     agg-mode-mainnet-postgres-1:
       ansible_host: agg-mode-mainnet-postgres-1
       admin_user: admin
       ansible_user: admin
       ansible_python_interpreter: /usr/bin/python3
 
-# PostgreSQL Secondary
-postgres_secondary:
+# PostgreSQL Node 2
+postgres_2:
   hosts:
     agg-mode-mainnet-postgres-2:
       ansible_host: agg-mode-mainnet-postgres-2
@@ -29,20 +29,20 @@ postgres_secondary:
 postgres_cluster:
   children:
     postgres_monitor:
-    postgres_primary:
-    postgres_secondary:
+    postgres_1:
+    postgres_2:
 
-# Gateway Primary
-gateway_primary:
+# Gateway Node 1
+gateway_1:
   hosts:
     agg-mode-mainnet-gateway-1:
       ansible_host: agg-mode-mainnet-gateway-1
       admin_user: admin
       ansible_user: app
       ansible_python_interpreter: /usr/bin/python3
 
-# Gateway Secondary
-gateway_secondary:
+# Gateway Node 2
+gateway_2:
   hosts:
     agg-mode-mainnet-gateway-2:
       ansible_host: agg-mode-mainnet-gateway-2
@@ -53,8 +53,8 @@ gateway_secondary:
 # Gateway Cluster (all gateway nodes)
 gateway_cluster:
   children:
-    gateway_primary:
-    gateway_secondary:
+    gateway_1:
+    gateway_2:
 
 # Metrics Server
 metrics:

infra/aggregation_mode/ansible/playbooks/deploy_all.yaml

@@ -3,16 +3,16 @@
   vars:
     env: "{{ env }}"
 
-- name: Deploy Gateway and Poller on Primary
+- name: Deploy Gateway and Poller on Node 1
   ansible.builtin.import_playbook: gateway_stack.yaml
   vars:
-    host: gateway_primary
+    host: gateway_1
     env: "{{ env }}"
 
-- name: Deploy Gateway and Poller on Secondary
+- name: Deploy Gateway and Poller on Node 2
   ansible.builtin.import_playbook: gateway_stack.yaml
   vars:
-    host: gateway_secondary
+    host: gateway_2
     env: "{{ env }}"
 
 - name: Deploy Metrics Stack

infra/aggregation_mode/ansible/playbooks/gateway.yaml

@@ -29,8 +29,8 @@
         gateway_db_user: "{{ lookup('ini', 'db_user', file=config_file) }}"
         gateway_db_password: "{{ lookup('ini', 'db_password', file=config_file) }}"
         gateway_db_name: "{{ lookup('ini', 'db_name', file=config_file) }}"
-        gateway_postgres_primary: "{{ lookup('ini', 'gateway_postgres_primary', file=config_file) }}"
-        gateway_postgres_secondary: "{{ lookup('ini', 'gateway_postgres_secondary', file=config_file) }}"
+        gateway_postgres_1: "{{ lookup('ini', 'gateway_postgres_1', file=config_file) }}"
+        gateway_postgres_2: "{{ lookup('ini', 'gateway_postgres_2', file=config_file) }}"
         gateway_postgres_port: "{{ lookup('ini', 'gateway_postgres_port', file=config_file, default='5432') }}"
         gateway_eth_rpc_url: "{{ lookup('ini', 'gateway_eth_rpc_url', file=config_file) }}"
         gateway_payment_service_address: "{{ lookup('ini', 'gateway_payment_service_address', file=config_file) }}"

infra/aggregation_mode/ansible/playbooks/grafana_agg_mode.yaml

@@ -25,6 +25,9 @@
         grafana_monitor_host: "{{ lookup('ini', 'grafana_monitor_host', file=config_file) }}"
         grafana_monitor_port: "{{ lookup('ini', 'grafana_monitor_port', file=config_file, default='5432') }}"
         grafana_monitor_db: "{{ lookup('ini', 'grafana_monitor_db', file=config_file, default='pg_auto_failover') }}"
+        gateway_1_hostname: "{{ lookup('ini', 'gateway_1_hostname', file=config_file) }}"
+        gateway_2_hostname: "{{ lookup('ini', 'gateway_2_hostname', file=config_file) }}"
+        grafana_gateway_url: "{{ lookup('ini', 'grafana_gateway_url', file=config_file) }}"
       no_log: true
 
     - name: Install required packages

infra/aggregation_mode/ansible/playbooks/ini/config-hoodi.ini

@@ -29,8 +29,8 @@ git_branch=staging
 # PostgreSQL Configuration
 # ============================================
 postgres_monitor_hostname=agg-mode-hoodi-postgres-monitor
-postgres_primary_hostname=agg-mode-hoodi-postgres-1
-postgres_secondary_hostname=agg-mode-hoodi-postgres-2
+postgres_1_hostname=agg-mode-hoodi-postgres-1
+postgres_2_hostname=agg-mode-hoodi-postgres-2
 db_name=agg_mode
 db_user=autoctl_node
 
@@ -51,8 +51,8 @@ gateway_max_daily_proofs=100
 gateway_payment_service_address=0x7222E0183cE1A96619d0c883e9bfc6b76D4e780e
 gateway_eth_rpc_url=https://aligned-hoodi-rpc-geth.tail665ae.ts.net
 
-gateway_postgres_primary=agg-mode-hoodi-postgres-1
-gateway_postgres_secondary=agg-mode-hoodi-postgres-2
+gateway_postgres_1=agg-mode-hoodi-postgres-1
+gateway_postgres_2=agg-mode-hoodi-postgres-2
 gateway_postgres_port=5432
 
 # Metrics ports
@@ -74,8 +74,8 @@ last_block_fetched_initial_value=0
 # Metrics Configuration
 # ============================================
 prometheus_version=3.6.0
-gateway_primary_hostname=agg-mode-hoodi-gateway-1
-gateway_secondary_hostname=agg-mode-hoodi-gateway-2
+gateway_1_hostname=agg-mode-hoodi-gateway-1
+gateway_2_hostname=agg-mode-hoodi-gateway-2
 
 # Grafana Configuration
 grafana_prometheus_url=http://localhost:9090
@@ -88,6 +88,8 @@ grafana_postgres_user=grafana
 grafana_monitor_host=agg-mode-hoodi-postgres-monitor
 grafana_monitor_port=5432
 grafana_monitor_db=pg_auto_failover
+# Public gateway URL
+grafana_gateway_url=https://hoodi.gateway.alignedlayer.com
 
 # ============================================
 # Task Sender Configuration

infra/aggregation_mode/ansible/playbooks/ini/config-mainnet.ini

@@ -29,8 +29,8 @@ git_branch=staging
 # PostgreSQL Configuration
 # ============================================
 postgres_monitor_hostname=agg-mode-mainnet-postgres-monitor
-postgres_primary_hostname=agg-mode-mainnet-postgres-1
-postgres_secondary_hostname=agg-mode-mainnet-postgres-2
+postgres_1_hostname=agg-mode-mainnet-postgres-1
+postgres_2_hostname=agg-mode-mainnet-postgres-2
 db_name=agg_mode
 db_user=autoctl_node
 
@@ -51,8 +51,8 @@ gateway_max_daily_proofs=100
 gateway_payment_service_address=0xc8631Bc1E60c20db40e474F791126212fA8255F4
 gateway_eth_rpc_url=https://aligned-mainnet-rpc-1.tail665ae.ts.net
 
-gateway_postgres_primary=agg-mode-mainnet-postgres-1
-gateway_postgres_secondary=agg-mode-mainnet-postgres-2
+gateway_postgres_1=agg-mode-mainnet-postgres-1
+gateway_postgres_2=agg-mode-mainnet-postgres-2
 gateway_postgres_port=5432
 
 # Metrics ports
@@ -74,8 +74,8 @@ last_block_fetched_initial_value=24235289
 # Metrics Configuration
 # ============================================
 prometheus_version=3.6.0
-gateway_primary_hostname=agg-mode-mainnet-gateway-1
-gateway_secondary_hostname=agg-mode-mainnet-gateway-2
+gateway_1_hostname=agg-mode-mainnet-gateway-1
+gateway_2_hostname=agg-mode-mainnet-gateway-2
 
 # Grafana Configuration
 grafana_prometheus_url=http://localhost:9090
@@ -88,6 +88,8 @@ grafana_postgres_user=grafana
 grafana_monitor_host=agg-mode-mainnet-postgres-monitor
 grafana_monitor_port=5432
 grafana_monitor_db=pg_auto_failover
+# Public gateway URL
+grafana_gateway_url=https://mainnet.gateway.alignedlayer.com
 
 # ============================================
 # Task Sender Configuration

infra/aggregation_mode/ansible/playbooks/poller.yaml

@@ -24,8 +24,8 @@
         poller_db_user: "{{ lookup('ini', 'db_user', file=config_file) }}"
         poller_db_password: "{{ lookup('ini', 'db_password', file=config_file) }}"
         poller_db_name: "{{ lookup('ini', 'db_name', file=config_file) }}"
-        poller_postgres_primary: "{{ lookup('ini', 'gateway_postgres_primary', file=config_file) }}"
-        poller_postgres_secondary: "{{ lookup('ini', 'gateway_postgres_secondary', file=config_file) }}"
+        poller_postgres_1: "{{ lookup('ini', 'gateway_postgres_1', file=config_file) }}"
+        poller_postgres_2: "{{ lookup('ini', 'gateway_postgres_2', file=config_file) }}"
         poller_postgres_port: "{{ lookup('ini', 'gateway_postgres_port', file=config_file, default='5432') }}"
         poller_eth_rpc_url: "{{ lookup('ini', 'gateway_eth_rpc_url', file=config_file) }}"
         poller_payment_service_address: "{{ lookup('ini', 'gateway_payment_service_address', file=config_file) }}"

infra/aggregation_mode/ansible/playbooks/postgres_cluster.yaml

@@ -4,20 +4,20 @@
     host: postgres_monitor
     env: "{{ env }}"
 
-- name: Deploy PostgreSQL Primary Node
+- name: Deploy PostgreSQL Node 1
   ansible.builtin.import_playbook: pg_node.yaml
   vars:
-    host: postgres_primary
+    host: postgres_1
     env: "{{ env }}"
 
-- name: Deploy PostgreSQL Secondary Node
+- name: Deploy PostgreSQL Node 2
   ansible.builtin.import_playbook: pg_node.yaml
   vars:
-    host: postgres_secondary
+    host: postgres_2
     env: "{{ env }}"
 
 - name: Run Database Migrations
   ansible.builtin.import_playbook: postgres_migrations.yaml
   vars:
-    host: postgres_primary
+    host: postgres_1
     env: "{{ env }}"