openstack/tripleo-validations
Code Issues Proposed changes

Merge "Improve Ceph health checks to work with custom cluster names"

Browse Source
This commit is contained in:
Zuul 2019-08-05 20:19:07 +00:00 committed by Gerrit Code Review
commit dcf051ec42
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,16 @@
- ceph_mon_enabled is succeeded - ceph_mon_enabled is succeeded
- ceph_mon_container is succeeded - ceph_mon_container is succeeded
block: block:
- name: Set ceph cluster name
become: true
shell: find /etc/ceph -name '*.conf' -exec basename -s .conf {} \; 2>/dev/null | head -n1
ignore_errors: true
register: ceph_cluster_name
changed_when: False
- name: Get ceph health - name: Get ceph health
become: true become: true
shell: "{{ container_cli }} exec {{ ceph_mon_container.stdout }} ceph health | awk '{print $1}'" shell: "{{ container_cli }} exec {{ ceph_mon_container.stdout }} ceph --cluster {{ ceph_cluster_name }} health | awk '{print $1}'"
register: ceph_health register: ceph_health
- name: Check ceph health - name: Check ceph health
@ -59,7 +66,7 @@
- name: Get OSD stat percentage - name: Get OSD stat percentage
become: true become: true
shell: "{{ container_cli }} exec {{ ceph_mon_container.stdout }} ceph osd stat -f json | jq '{{ jq_osd_percentage_filter }}'" shell: "{{ container_cli }} exec {{ ceph_mon_container.stdout }} ceph --cluster {{ ceph_cluster_name }} osd stat -f json | jq '{{ jq_osd_percentage_filter }}'"
register: ceph_osd_in_percentage register: ceph_osd_in_percentage
- name: Fail if there is an unacceptable percentage of in OSDs - name: Fail if there is an unacceptable percentage of in OSDs