From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 21 Jan 2021 20:26:09 +0000 (-0500)
Subject: cephadm-adopt: remove prometheus workaround
X-Git-Tag: v6.0.0
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=950a6ae40650ebecc0073cc71df7fbaeb769ec30;p=ceph-ansible.git

cephadm-adopt: remove prometheus workaround

This was fixed by [1][2]

[1] https://tracker.ceph.com/issues/45120
[2] https://github.com/ceph/ceph/commit/252d4b30

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 3cc84cae7..9127dd10e 100644
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -959,15 +959,6 @@
             path: /var/lib/prom_metrics
             state: absent
 
-        # (workaround) https://tracker.ceph.com/issues/45120
-        - name: create missing prometheus target directory
-          file:
-            path: '/var/lib/ceph/{{ fsid }}/prometheus.{{ ansible_hostname }}/etc/prometheus'
-            state: directory
-            owner: 65534
-            group: 65534
-            recurse: true
-
         - name: adopt prometheus daemon
           cephadm_adopt:
             name: "prometheus.{{ ansible_hostname }}"