openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Make Get OSD stat percentage compatible with jq < 1.5" into stable/ussuri

This commit is contained in:
Zuul 2020-08-04 16:59:02 +00:00 committed by Gerrit Code Review
parent 2ff6d6e5d1 1de1854bed
commit 57df4ed2d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph/tasks/ceph-health.yaml
View File

@ -63,9 +63,11 @@
- when:
- osd_percentage_min|default(0) > 0
block:
# 1.3+ <= jq <= 1.5 doesn't support try-catch: we rely on if - then -else approach to check if ceph has .osdmap layout
- name: set jq osd percentage filter
set_fact:
jq_osd_percentage_filter: '( (try .osdmap.num_in_osds + try .num_in_osds) / (try .osdmap.num_osds + try .num_osds)) * 100'
jq_osd_percentage_filter: '(if .osdmap != null then { osds: (.osdmap.num_in_osds / .osdmap.num_osds * 100) }
else { osds: (.num_in_osds / .num_osds * 100) } end) | .osds'
- name: Get OSD stat percentage
become: true