From: Fernando <fernando.alcocer.ochoa@ibm.com>
Date: Wed, 22 Jan 2025 18:35:29 +0000 (-0600)
Subject: Adding a validation to ensure /etc/apt/keyrings path exists
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F763%2Fhead;p=ceph-cm-ansible.git

Adding a validation to ensure /etc/apt/keyrings path exists

Fixes: https://ibm.monday.com/boards/5591222586/pulses/8269716052

Signed-off-by: Fernando <fernando.alcocer.ochoa@ibm.com>
---

diff --git a/roles/grafana_agent/tasks/main.yml b/roles/grafana_agent/tasks/main.yml
index 11fa400..a0ebc62 100644
--- a/roles/grafana_agent/tasks/main.yml
+++ b/roles/grafana_agent/tasks/main.yml
@@ -18,6 +18,16 @@
   loop: "{{ tcp_listen_violations }}"
   failed_when: true
 
+- name: "Ensure that path /etc/apt/keyrings exists"
+  become: true
+  ansible.builtin.file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: '0755'
+    force: true
+  when: ansible_pkg_mgr == "apt"
+  register: keyrings_exists
+
 - name: "Import Grafana GPG key"
   become: true
   ansible.builtin.get_url:
@@ -25,7 +35,7 @@
     dest: /etc/apt/keyrings/grafana.gpg
     mode: '0644'
     force: true
-  when: ansible_pkg_mgr == "apt"
+  when: ansible_pkg_mgr == "apt" and keyrings_exists is defined
 
 - name: Ensure downloaded file for key is a binary keyring
   shell: "cat /etc/apt/keyrings/grafana.gpg | gpg --dearmor | sudo tee /etc/apt/keyrings/grafana.gpg > /dev/null"