From a20e7177c63107998446903bc10c53b5ffb390c5 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Mon, 1 Jul 2019 12:34:46 -0500
Subject: [PATCH] Ceph-osd: Fix static osd id  to variable

This is to fix static osd id logic to variable as we have an issue
in our current logic.
this is happening only when we have file backed journals and
block backed data as shown below.

ex:

 storage:
    osd:
      - data:
          type: block-logical
          location: /dev/vdb
        journal:
          type: directory
          location: /var/lib/openstack-helm/ceph/osd/journal-one
      - data:
          type: block-logical
          location: /dev/vdc
        journal:
          type: directory
          location: /var/lib/openstack-helm/ceph/osd/journal-two

Change-Id: I36d08b1b7aa5925831a64c03259098f6c4753c3e
---
 ceph-osd/templates/bin/osd/_block.sh.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ceph-osd/templates/bin/osd/_block.sh.tpl b/ceph-osd/templates/bin/osd/_block.sh.tpl
index 5817dfca2..aa40d68d0 100644
--- a/ceph-osd/templates/bin/osd/_block.sh.tpl
+++ b/ceph-osd/templates/bin/osd/_block.sh.tpl
@@ -114,7 +114,7 @@ if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then
     --osd-data ${OSD_PATH} \
     --osd-journal ${OSD_JOURNAL} \
     -f \
-    -i 0 \
+    -i ${OSD_ID} \
     --setuser ceph \
     --setgroup disk \
     --mkjournal