From: WingkaiHo <sanguosfiang@163.com>
Date: Wed, 22 Mar 2017 02:06:11 +0000 (+0800)
Subject: This assumes ceph as a cluster name. We need detect the name of the cluster
X-Git-Tag: v2.2.0~16^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83a1ac0c676ad6670f258a1fa729b6b6ebf834ec;p=ceph-ansible.git

This assumes ceph as a cluster name. We need detect the name of the cluster
---

diff --git a/infrastructure-playbooks/recover-osds-after-ssd-journal-failure.yml b/infrastructure-playbooks/recover-osds-after-ssd-journal-failure.yml
index 0cf1d94b0..f2f59b911 100644
--- a/infrastructure-playbooks/recover-osds-after-ssd-journal-failure.yml
+++ b/infrastructure-playbooks/recover-osds-after-ssd-journal-failure.yml
@@ -64,7 +64,7 @@
         
   - name: get osd(s) if directory stat
     stat:
-      path: "/var/lib/ceph/osd/ceph-{{ item.1.osd_id }}/journal_uuid"
+      path: "/var/lib/ceph/osd/{{ cluster_name }}-{{ item.1.osd_id }}/journal_uuid"
     register: osds_dir_stat
     with_subelements:
       - "{{ dev_ssds }}"
@@ -86,7 +86,7 @@
     when: dev_ssds is defined
     
   - name: get osd(s) journal uuid
-    shell: cat "/var/lib/ceph/osd/ceph-{{ item.1.osd_id }}/journal_uuid"
+    shell: cat "/var/lib/ceph/osd/{{ cluster_name.stdout }}-{{ item.1.osd_id }}/journal_uuid"
     register: osds_uuid
     with_subelements:
       - "{{ dev_ssds }}"