From 731f80cbc8f47481f3dca2c30285864b8ce89169 Mon Sep 17 00:00:00 2001 From: decfox Date: Mon, 7 Sep 2026 12:24:45 +0530 Subject: [PATCH 1/2] feat: make fastpath image as env var for ansible role --- ansible/host_vars/fastpath.dev.ooni.io/vars.yml | 3 ++- ansible/roles/fastpath/defaults/main.yml | 3 +++ ansible/roles/fastpath/tasks/main.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ansible/host_vars/fastpath.dev.ooni.io/vars.yml b/ansible/host_vars/fastpath.dev.ooni.io/vars.yml index e60bcb31..ed30f067 100644 --- a/ansible/host_vars/fastpath.dev.ooni.io/vars.yml +++ b/ansible/host_vars/fastpath.dev.ooni.io/vars.yml @@ -3,4 +3,5 @@ clickhouse_url: "clickhouse://fastpath:{{ lookup('amazon.aws.aws_ssm', '/oonidev bucket_name: "ooni-data-eu-fra-test" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "3" -env: "dev" \ No newline at end of file +env: "dev" +fastpath_image: "ooni/fastpath:20260903-7c51eb5d" diff --git a/ansible/roles/fastpath/defaults/main.yml b/ansible/roles/fastpath/defaults/main.yml index 2a40e928..e9fd0dc0 100644 --- a/ansible/roles/fastpath/defaults/main.yml +++ b/ansible/roles/fastpath/defaults/main.yml @@ -4,5 +4,8 @@ tls_cert_dir: /var/lib/dehydrated/certs fastpath_user: fastpath fastpath_home: "/opt/{{ fastpath_user }}" +# Fastpath container image +fastpath_image: "ooni/fastpath:20260416-37f9e89c" + # Fastpath settings clickhouse_url: "clickhouse://fastpath:{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/clickhouse_fastpath_password', profile='oonidevops_user_prod') }}@clickhouseproxy.dev.ooni.io/oonitest" diff --git a/ansible/roles/fastpath/tasks/main.yml b/ansible/roles/fastpath/tasks/main.yml index 948105bc..8b381b65 100644 --- a/ansible/roles/fastpath/tasks/main.yml +++ b/ansible/roles/fastpath/tasks/main.yml @@ -149,7 +149,7 @@ - name: Ensure fastpath is running community.docker.docker_container: name: fastpath - image: ooni/fastpath:20260416-37f9e89c + image: "{{ fastpath_image }}" state: started restart_policy: always user: "{{user_uid.stdout}}:{{user_gid.stdout}}" From c691fe629cde298887ecda1ae7df5a4ca0dbd3d2 Mon Sep 17 00:00:00 2001 From: decfox Date: Mon, 7 Sep 2026 17:53:52 +0530 Subject: [PATCH 2/2] chore: explicitly pass in fastpath image tags for prod env --- ansible/host_vars/fastpath.prod.ooni.io/vars.yml | 1 + ansible/host_vars/fastpath2.prod.ooni.io/vars.yml | 1 + ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml | 1 + ansible/roles/fastpath/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/host_vars/fastpath.prod.ooni.io/vars.yml b/ansible/host_vars/fastpath.prod.ooni.io/vars.yml index f43f5acd..08b4f34a 100644 --- a/ansible/host_vars/fastpath.prod.ooni.io/vars.yml +++ b/ansible/host_vars/fastpath.prod.ooni.io/vars.yml @@ -4,3 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "1" env: "prod" +fastpath_image: "ooni/fastpath:20260416-37f9e89c" diff --git a/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml b/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml index 441cf286..b80d95bf 100644 --- a/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml +++ b/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml @@ -4,3 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "4" env: "prod" +fastpath_image: "ooni/fastpath:20260416-37f9e89c" diff --git a/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml b/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml index 3918076b..b688ed41 100644 --- a/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml +++ b/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml @@ -4,3 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "5" env: "prod" +fastpath_image: "ooni/fastpath:20260416-37f9e89c" diff --git a/ansible/roles/fastpath/defaults/main.yml b/ansible/roles/fastpath/defaults/main.yml index e9fd0dc0..99e4bdbb 100644 --- a/ansible/roles/fastpath/defaults/main.yml +++ b/ansible/roles/fastpath/defaults/main.yml @@ -5,7 +5,7 @@ fastpath_user: fastpath fastpath_home: "/opt/{{ fastpath_user }}" # Fastpath container image -fastpath_image: "ooni/fastpath:20260416-37f9e89c" +fastpath_image: "ooni/fastpath:latest" # Fastpath settings clickhouse_url: "clickhouse://fastpath:{{ lookup('amazon.aws.aws_ssm', '/oonidevops/secrets/clickhouse_fastpath_password', profile='oonidevops_user_prod') }}@clickhouseproxy.dev.ooni.io/oonitest"