From: Seena Fallah <seenafallah@gmail.com>
Date: Sat, 5 Dec 2020 21:55:46 +0000 (+0330)
Subject: ceph-osd: use global crush_device_class in lvm_volumes
X-Git-Tag: v4.0.42~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2485b358252170be2d013660fa70c761c16037c1;p=ceph-ansible.git

ceph-osd: use global crush_device_class in lvm_volumes

Use global crush_device_class variable if it's not set per OSD

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 5e9444fa5c283587d38e823012c5bfdb434a8f2c)
---

diff --git a/roles/ceph-osd/tasks/scenarios/lvm.yml b/roles/ceph-osd/tasks/scenarios/lvm.yml
index a2a5940a9..3ac3ef154 100644
--- a/roles/ceph-osd/tasks/scenarios/lvm.yml
+++ b/roles/ceph-osd/tasks/scenarios/lvm.yml
@@ -11,7 +11,7 @@
     db_vg: "{{ item.db_vg|default(omit) }}"
     wal: "{{ item.wal|default(omit) }}"
     wal_vg: "{{ item.wal_vg|default(omit) }}"
-    crush_device_class: "{{ item.crush_device_class|default(omit) }}"
+    crush_device_class: "{{ item.crush_device_class | default(crush_device_class) | default(omit) }}"
     dmcrypt: "{{ dmcrypt|default(omit) }}"
     action: "{{ 'prepare' if containerized_deployment else 'create' }}"
   environment: