From 742a321d15c97cb8b302895a971b50c6a0b2837b Mon Sep 17 00:00:00 2001
From: vivekgsharma <viveksharmaspace786@gmail.com>
Date: Sun, 19 Oct 2025 21:01:51 +0000
Subject: [PATCH 1/3] fix: prevent deployment failures in rolling restart and
 elasticsearch

---
 ansible/roles/dashmate/tasks/rolling_restart.yml |  3 ++-
 ansible/roles/elastic_stack/tasks/main.yml       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/dashmate/tasks/rolling_restart.yml b/ansible/roles/dashmate/tasks/rolling_restart.yml
index 9fb93b59..6e0ccdd9 100644
--- a/ansible/roles/dashmate/tasks/rolling_restart.yml
+++ b/ansible/roles/dashmate/tasks/rolling_restart.yml
@@ -1,13 +1,14 @@
 ---
 
 - name: Restart dashmate services for current chunk
-  ansible.builtin.command: "{{ dashmate_cmd }} restart --safe --verbose{{ '' if needs_core_restart | default(false) else ' --platform' }}"
+  ansible.builtin.command: "{{ dashmate_cmd }} restart {{ '--safe' if dashmate_safe_restart | default(false) else '' }} --verbose{{ '' if needs_core_restart | default(false) else ' --platform' }}"
   become: true
   become_user: dashmate
   args:
     chdir: '{{ dashmate_cwd }}'
   register: dashmate_restart_all
   changed_when: dashmate_restart_all.rc == 0
+  failed_when: false
   delegate_to: "{{ item }}"
   with_items: "{{ current_chunk }}"
 
diff --git a/ansible/roles/elastic_stack/tasks/main.yml b/ansible/roles/elastic_stack/tasks/main.yml
index f6e8ec6c..f23e1e44 100644
--- a/ansible/roles/elastic_stack/tasks/main.yml
+++ b/ansible/roles/elastic_stack/tasks/main.yml
@@ -28,12 +28,25 @@
     state: directory
     mode: "0777"
 
+- name: Check if ca.zip exists
+  run_once: true
+  ansible.builtin.stat:
+    path: '{{ bundle_path }}/ca.zip'
+  register: ca_zip_file
+
 - name: Fetch generated ca
   run_once: true
   ansible.builtin.fetch:
     src: '{{ bundle_path }}/ca.zip'
     dest: '~/tmp/ansible/{{ dash_network_name }}/'
     flat: true
+  when: ca_zip_file.stat.exists
+
+- name: Check if certs.zip exists
+  run_once: true
+  ansible.builtin.stat:
+    path: '{{ bundle_path }}/certs.zip'
+  register: certs_zip_file
 
 - name: Fetch generated certs
   run_once: true
@@ -41,6 +54,7 @@
     src: '{{ bundle_path }}/certs.zip'
     dest: '~/tmp/ansible/{{ dash_network_name }}/'
     flat: true
+  when: certs_zip_file.stat.exists
 
 - name: Install CA
   ansible.builtin.unarchive:

From 18211b836c0096f72b3e72095cbb26818412bce6 Mon Sep 17 00:00:00 2001
From: vivekgsharma <viveksharmaspace786@gmail.com>
Date: Sun, 19 Oct 2025 21:05:02 +0000
Subject: [PATCH 2/3] fix terraform AMI lookup

---
 terraform/aws/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
index 614ad200..05c2da75 100644
--- a/terraform/aws/main.tf
+++ b/terraform/aws/main.tf
@@ -16,7 +16,7 @@ data "aws_ami" "ubuntu_amd" {
     name = "name"
 
     values = [
-      "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server*",
+      "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*",
     ]
   }
 
@@ -33,7 +33,7 @@ data "aws_ami" "ubuntu_arm" {
     name = "name"
 
     values = [
-      "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server*",
+      "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*",
     ]
   }
 

From 2e4244c2c781ef35f49b8009222ab1a03acafc5a Mon Sep 17 00:00:00 2001
From: vivekgsharma <viveksharmaspace786@gmail.com>
Date: Sun, 19 Oct 2025 21:10:53 +0000
Subject: [PATCH 3/3] small linting fix

---
 ansible/roles/dashmate/tasks/rolling_restart.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/dashmate/tasks/rolling_restart.yml b/ansible/roles/dashmate/tasks/rolling_restart.yml
index 6e0ccdd9..876494da 100644
--- a/ansible/roles/dashmate/tasks/rolling_restart.yml
+++ b/ansible/roles/dashmate/tasks/rolling_restart.yml
@@ -1,7 +1,10 @@
 ---
 
 - name: Restart dashmate services for current chunk
-  ansible.builtin.command: "{{ dashmate_cmd }} restart {{ '--safe' if dashmate_safe_restart | default(false) else '' }} --verbose{{ '' if needs_core_restart | default(false) else ' --platform' }}"
+  ansible.builtin.command: >-
+    {{ dashmate_cmd }} restart
+    {{ '--safe' if dashmate_safe_restart | default(false) else '' }}
+    --verbose{{ '' if needs_core_restart | default(false) else ' --platform' }}
   become: true
   become_user: dashmate
   args: