replaced hardcoded "ceph_disk" literal with variable based on the lvm_enabled pillar
Change-Id: I479ab9832961c4c5e012e661bdd06604ecfed638
Related-Prod: PROD-34370
(cherry picked from commit 12955c759f0f53b00c76af2e2798433e7705582b)
diff --git a/update-ceph.groovy b/update-ceph.groovy
index 60d0e78..00c16b3 100644
--- a/update-ceph.groovy
+++ b/update-ceph.groovy
@@ -60,11 +60,11 @@
}
stage('Restart OSDs') {
-
+ def device_grain_name = salt.getPillar(pepperEnv,"I@ceph:osd","ceph:osd:lvm_enabled")['return'].first().containsValue(true) ? "ceph_volume" : "ceph_disk"
selMinions = salt.getMinions(pepperEnv, "I@ceph:osd")
for (tgt in selMinions) {
salt.runSaltProcessStep(pepperEnv, tgt, 'saltutil.sync_grains', [], null, true, 5)
- def ceph_disks = salt.getGrain(pepperEnv, tgt, 'ceph')['return'][0].values()[0].values()[0]['ceph_disk']
+ def ceph_disks = salt.getGrain(pepperEnv, tgt, 'ceph')['return'][0].values()[0].values()[0][device_grain_name]
def osd_ids = []
for (i in ceph_disks) {