fix load variables correctly

Author: JuArce

infra/aggregation_mode/ansible/playbooks/deploy_all.yaml

@@ -1,22 +1,22 @@
-- name: Deploy Full Aggregation Mode Stack
-  hosts: localhost
-  gather_facts: no
+- name: Deploy PostgreSQL Cluster
+  ansible.builtin.import_playbook: postgres_cluster.yaml
+  vars:
+    env: "{{ env }}"
 
-  tasks:
-    - name: Deploy PostgreSQL Cluster
-      ansible.builtin.import_playbook: postgres_cluster.yaml
+- name: Deploy Gateway and Poller on Primary
+  ansible.builtin.import_playbook: gateway_stack.yaml
+  vars:
+    host: gateway_primary
+    env: "{{ env }}"
 
-    - name: Deploy Gateway and Poller on Primary
-      ansible.builtin.import_playbook: gateway_stack.yaml
-      vars:
-        host: gateway_primary
+- name: Deploy Gateway and Poller on Secondary
+  ansible.builtin.import_playbook: gateway_stack.yaml
+  vars:
+    host: gateway_secondary
+    env: "{{ env }}"
 
-    - name: Deploy Gateway and Poller on Secondary
-      ansible.builtin.import_playbook: gateway_stack.yaml
-      vars:
-        host: gateway_secondary
-
-    - name: Deploy Metrics Stack
-      ansible.builtin.import_playbook: metrics_stack.yaml
-      vars:
-        host: metrics
+- name: Deploy Metrics Stack
+  ansible.builtin.import_playbook: metrics_stack.yaml
+  vars:
+    host: metrics
+    env: "{{ env }}"

infra/aggregation_mode/ansible/playbooks/gateway.yaml

@@ -1,40 +1,46 @@
+- name: Import setup playbook
+  ansible.builtin.import_playbook: setup.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
+- name: Import rust playbook
+  ansible.builtin.import_playbook: rust.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
 - name: Gateway Setup
   hosts: "{{ host }}"
 
   tasks:
-    - name: Import setup playbook
-      ansible.builtin.import_playbook: setup.yaml
-      vars:
-        host: "{{ host }}"
+    - name: Set config file path
+      set_fact:
+        config_file: "ini/config-{{ env }}.ini"
 
-    - name: Import rust playbook
-      ansible.builtin.import_playbook: rust.yaml
-      vars:
-        host: "{{ host }}"
-
-- hosts: "{{ host }}"
-  vars:
-    git_branch: "{{ lookup('ini', 'git_branch', file='ini/config-{{ env }}.ini') }}"
-    gateway_port: "{{ lookup('ini', 'gateway_port', file='ini/config-{{ env }}.ini', default='8080') }}"
-    gateway_tls_enabled: "{{ lookup('ini', 'gateway_tls_enabled', file='ini/config-{{ env }}.ini', default='true') }}"
-    gateway_tls_port: "{{ lookup('ini', 'gateway_tls_port', file='ini/config-{{ env }}.ini', default='443') }}"
-    gateway_tls_cert_path: "{{ lookup('ini', 'gateway_tls_cert_path', file='ini/config-{{ env }}.ini') }}"
-    gateway_tls_key_path: "{{ lookup('ini', 'gateway_tls_key_path', file='ini/config-{{ env }}.ini') }}"
-    gateway_db_user: "{{ lookup('ini', 'gateway_db_user', file='ini/config-{{ env }}.ini') }}"
-    gateway_db_password: "{{ lookup('ini', 'gateway_db_password', file='ini/config-{{ env }}.ini') }}"
-    gateway_db_name: "{{ lookup('ini', 'gateway_db_name', file='ini/config-{{ env }}.ini') }}"
-    gateway_postgres_primary: "{{ lookup('ini', 'gateway_postgres_primary', file='ini/config-{{ env }}.ini') }}"
-    gateway_postgres_secondary: "{{ lookup('ini', 'gateway_postgres_secondary', file='ini/config-{{ env }}.ini') }}"
-    gateway_postgres_port: "{{ lookup('ini', 'gateway_postgres_port', file='ini/config-{{ env }}.ini', default='5432') }}"
-    gateway_eth_rpc_url: "{{ lookup('ini', 'gateway_eth_rpc_url', file='ini/config-{{ env }}.ini') }}"
-    gateway_payment_service_address: "{{ lookup('ini', 'gateway_payment_service_address', file='ini/config-{{ env }}.ini') }}"
-    gateway_network: "{{ lookup('ini', 'gateway_network', file='ini/config-{{ env }}.ini') }}"
-    gateway_max_daily_proofs: "{{ lookup('ini', 'gateway_max_daily_proofs', file='ini/config-{{ env }}.ini', default='100') }}"
-    gateway_metrics_port: "{{ lookup('ini', 'gateway_metrics_port', file='ini/config-{{ env }}.ini', default='9094') }}"
-    tls_cert_source_path: "{{ lookup('ini', 'tls_cert_source_path', file='ini/config-{{ env }}.ini') }}"
-    tls_key_source_path: "{{ lookup('ini', 'tls_key_source_path', file='ini/config-{{ env }}.ini') }}"
+    - name: Set config vars from INI file
+      set_fact:
+        git_branch: "{{ lookup('ini', 'git_branch', file=config_file) }}"
+        gateway_port: "{{ lookup('ini', 'gateway_port', file=config_file, default='8080') }}"
+        gateway_tls_enabled: "{{ lookup('ini', 'gateway_tls_enabled', file=config_file, default='true') }}"
+        gateway_tls_port: "{{ lookup('ini', 'gateway_tls_port', file=config_file, default='443') }}"
+        gateway_tls_cert_path: "{{ lookup('ini', 'gateway_tls_cert_path', file=config_file) }}"
+        gateway_tls_key_path: "{{ lookup('ini', 'gateway_tls_key_path', file=config_file) }}"
+        gateway_db_user: "{{ lookup('ini', 'gateway_db_user', file=config_file) }}"
+        gateway_db_password: "{{ lookup('ini', 'gateway_db_password', file=config_file) }}"
+        gateway_db_name: "{{ lookup('ini', 'gateway_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_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) }}"
+        gateway_network: "{{ lookup('ini', 'gateway_network', file=config_file) }}"
+        gateway_max_daily_proofs: "{{ lookup('ini', 'gateway_max_daily_proofs', file=config_file, default='100') }}"
+        gateway_metrics_port: "{{ lookup('ini', 'gateway_metrics_port', file=config_file, default='9094') }}"
+        tls_cert_source_path: "{{ lookup('ini', 'tls_cert_source_path', file=config_file) }}"
+        tls_key_source_path: "{{ lookup('ini', 'tls_key_source_path', file=config_file) }}"
+      no_log: true
 
-  tasks:
     - name: Install required system packages
       become: true
       apt:

infra/aggregation_mode/ansible/playbooks/gateway_stack.yaml

@@ -1,13 +1,11 @@
-- name: Deploy Gateway and Poller Stack
-  hosts: "{{ host }}"
+- name: Deploy Gateway
+  ansible.builtin.import_playbook: gateway.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
 
-  tasks:
-    - name: Deploy Gateway
-      ansible.builtin.import_playbook: gateway.yaml
-      vars:
-        host: "{{ host }}"
-
-    - name: Deploy Poller
-      ansible.builtin.import_playbook: poller.yaml
-      vars:
-        host: "{{ host }}"
+- name: Deploy Poller
+  ansible.builtin.import_playbook: poller.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"

infra/aggregation_mode/ansible/playbooks/grafana_agg_mode.yaml

@@ -1,23 +1,28 @@
+- name: Import setup playbook
+  ansible.builtin.import_playbook: setup.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
 - name: Grafana Setup for Aggregation Mode
   hosts: "{{ host }}"
 
   tasks:
-    - name: Import setup playbook
-      ansible.builtin.import_playbook: setup.yaml
-      vars:
-        host: "{{ host }}"
+    - name: Set config file path
+      set_fact:
+        config_file: "ini/config-{{ env }}.ini"
 
-- hosts: "{{ host }}"
-  vars:
-    grafana_prometheus_url: "{{ lookup('ini', 'grafana_prometheus_url', file='ini/config-{{ env }}.ini') }}"
-    grafana_rpc_url: "{{ lookup('ini', 'grafana_rpc_url', file='ini/config-{{ env }}.ini') }}"
-    grafana_postgres_host: "{{ lookup('ini', 'grafana_postgres_host', file='ini/config-{{ env }}.ini') }}"
-    grafana_postgres_port: "{{ lookup('ini', 'grafana_postgres_port', file='ini/config-{{ env }}.ini', default='5432') }}"
-    grafana_postgres_db: "{{ lookup('ini', 'grafana_postgres_db', file='ini/config-{{ env }}.ini') }}"
-    grafana_postgres_user: "{{ lookup('ini', 'grafana_postgres_user', file='ini/config-{{ env }}.ini') }}"
-    grafana_postgres_password: "{{ lookup('ini', 'grafana_postgres_password', file='ini/config-{{ env }}.ini') }}"
+    - name: Set config vars from INI file
+      set_fact:
+        grafana_prometheus_url: "{{ lookup('ini', 'grafana_prometheus_url', file=config_file) }}"
+        grafana_rpc_url: "{{ lookup('ini', 'grafana_rpc_url', file=config_file) }}"
+        grafana_postgres_host: "{{ lookup('ini', 'grafana_postgres_host', file=config_file) }}"
+        grafana_postgres_port: "{{ lookup('ini', 'grafana_postgres_port', file=config_file, default='5432') }}"
+        grafana_postgres_db: "{{ lookup('ini', 'grafana_postgres_db', file=config_file) }}"
+        grafana_postgres_user: "{{ lookup('ini', 'grafana_postgres_user', file=config_file) }}"
+        grafana_postgres_password: "{{ lookup('ini', 'grafana_postgres_password', file=config_file) }}"
+      no_log: true
 
-  tasks:
     - name: Install required packages
       become: true
       apt:

infra/aggregation_mode/ansible/playbooks/metrics_stack.yaml

@@ -1,13 +1,11 @@
-- name: Deploy Metrics Stack
-  hosts: "{{ host }}"
+- name: Deploy Prometheus
+  ansible.builtin.import_playbook: prometheus_agg_mode.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
 
-  tasks:
-    - name: Deploy Prometheus
-      ansible.builtin.import_playbook: prometheus_agg_mode.yaml
-      vars:
-        host: "{{ host }}"
-
-    - name: Deploy Grafana
-      ansible.builtin.import_playbook: grafana_agg_mode.yaml
-      vars:
-        host: "{{ host }}"
+- name: Deploy Grafana
+  ansible.builtin.import_playbook: grafana_agg_mode.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"

infra/aggregation_mode/ansible/playbooks/poller.yaml

@@ -1,35 +1,41 @@
+- name: Import setup playbook
+  ansible.builtin.import_playbook: setup.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
+- name: Import rust playbook
+  ansible.builtin.import_playbook: rust.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
 - name: Poller Setup
   hosts: "{{ host }}"
 
   tasks:
-    - name: Import setup playbook
-      ansible.builtin.import_playbook: setup.yaml
-      vars:
-        host: "{{ host }}"
+    - name: Set config file path
+      set_fact:
+        config_file: "ini/config-{{ env }}.ini"
 
-    - name: Import rust playbook
-      ansible.builtin.import_playbook: rust.yaml
-      vars:
-        host: "{{ host }}"
-
-- hosts: "{{ host }}"
-  vars:
-    git_branch: "{{ lookup('ini', 'git_branch', file='ini/config-{{ env }}.ini') }}"
-    poller_db_user: "{{ lookup('ini', 'gateway_db_user', file='ini/config-{{ env }}.ini') }}"
-    poller_db_password: "{{ lookup('ini', 'gateway_db_password', file='ini/config-{{ env }}.ini') }}"
-    poller_db_name: "{{ lookup('ini', 'gateway_db_name', file='ini/config-{{ env }}.ini') }}"
-    poller_postgres_primary: "{{ lookup('ini', 'gateway_postgres_primary', file='ini/config-{{ env }}.ini') }}"
-    poller_postgres_secondary: "{{ lookup('ini', 'gateway_postgres_secondary', file='ini/config-{{ env }}.ini') }}"
-    poller_postgres_port: "{{ lookup('ini', 'gateway_postgres_port', file='ini/config-{{ env }}.ini', default='5432') }}"
-    poller_eth_rpc_url: "{{ lookup('ini', 'gateway_eth_rpc_url', file='ini/config-{{ env }}.ini') }}"
-    poller_payment_service_address: "{{ lookup('ini', 'gateway_payment_service_address', file='ini/config-{{ env }}.ini') }}"
-    poller_network: "{{ lookup('ini', 'gateway_network', file='ini/config-{{ env }}.ini') }}"
-    poller_max_daily_proofs: "{{ lookup('ini', 'gateway_max_daily_proofs', file='ini/config-{{ env }}.ini', default='100') }}"
-    poller_last_block_fetched_filepath: "{{ lookup('ini', 'poller_last_block_fetched_filepath', file='ini/config-{{ env }}.ini') }}"
-    last_block_fetched_initial_value: "{{ lookup('ini', 'last_block_fetched_initial_value', file='ini/config-{{ env }}.ini', default='0') }}"
-    poller_metrics_port: "{{ lookup('ini', 'poller_metrics_port', file='ini/config-{{ env }}.ini', default='9095') }}"
+    - name: Set config vars from INI file
+      set_fact:
+        git_branch: "{{ lookup('ini', 'git_branch', file=config_file) }}"
+        poller_db_user: "{{ lookup('ini', 'gateway_db_user', file=config_file) }}"
+        poller_db_password: "{{ lookup('ini', 'gateway_db_password', file=config_file) }}"
+        poller_db_name: "{{ lookup('ini', 'gateway_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_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) }}"
+        poller_network: "{{ lookup('ini', 'gateway_network', file=config_file) }}"
+        poller_max_daily_proofs: "{{ lookup('ini', 'gateway_max_daily_proofs', file=config_file, default='100') }}"
+        poller_last_block_fetched_filepath: "{{ lookup('ini', 'poller_last_block_fetched_filepath', file=config_file) }}"
+        last_block_fetched_initial_value: "{{ lookup('ini', 'last_block_fetched_initial_value', file=config_file, default='0') }}"
+        poller_metrics_port: "{{ lookup('ini', 'poller_metrics_port', file=config_file, default='9095') }}"
+      no_log: true
 
-  tasks:
     - name: Install required system packages
       become: true
       apt:

infra/aggregation_mode/ansible/playbooks/prometheus_agg_mode.yaml

@@ -1,21 +1,25 @@
+- name: Import setup playbook
+  ansible.builtin.import_playbook: setup.yaml
+  vars:
+    host: "{{ host }}"
+    env: "{{ env }}"
+
 - name: Prometheus Setup for Aggregation Mode
   hosts: "{{ host }}"
 
   tasks:
-    - name: Import setup playbook
-      ansible.builtin.import_playbook: setup.yaml
-      vars:
-        host: "{{ host }}"
+    - name: Set config file path
+      set_fact:
+        config_file: "ini/config-{{ env }}.ini"
 
-- hosts: "{{ host }}"
-  vars:
-    prometheus_version: "{{ lookup('ini', 'prometheus_version', file='ini/config-{{ env }}.ini', default='3.6.0') }}"
-    gateway_primary_hostname: "{{ lookup('ini', 'gateway_primary_hostname', file='ini/config-{{ env }}.ini') }}"
-    gateway_secondary_hostname: "{{ lookup('ini', 'gateway_secondary_hostname', file='ini/config-{{ env }}.ini') }}"
-    gateway_metrics_port: "{{ lookup('ini', 'gateway_metrics_port', file='ini/config-{{ env }}.ini', default='9094') }}"
-    poller_metrics_port: "{{ lookup('ini', 'poller_metrics_port', file='ini/config-{{ env }}.ini', default='9095') }}"
+    - name: Set config vars from INI file
+      set_fact:
+        prometheus_version: "{{ lookup('ini', 'prometheus_version', file=config_file, default='3.6.0') }}"
+        gateway_primary_hostname: "{{ lookup('ini', 'gateway_primary_hostname', file=config_file) }}"
+        gateway_secondary_hostname: "{{ lookup('ini', 'gateway_secondary_hostname', file=config_file) }}"
+        gateway_metrics_port: "{{ lookup('ini', 'gateway_metrics_port', file=config_file, default='9094') }}"
+        poller_metrics_port: "{{ lookup('ini', 'poller_metrics_port', file=config_file, default='9095') }}"
 
-  tasks:
     - name: Check if Prometheus is installed
       stat:
         path: /home/{{ ansible_user }}/prometheus-{{ prometheus_version }}.linux-amd64/prometheus