Merge pull request #1814 from ceph/handler-defaults

handler: default to empty array if task skipped
pull/1826/head
Sébastien Han 2017-08-29 11:09:35 +02:00 committed by GitHub
commit b3e5206289
1 changed files with 1 additions and 2 deletions

View File

@ -40,12 +40,11 @@
- name: restart containerized ceph osds daemon(s) - name: restart containerized ceph osds daemon(s)
command: /tmp/restart_osd_daemon.sh command: /tmp/restart_osd_daemon.sh
listen: "restart ceph osds" listen: "restart ceph osds"
with_items: "{{ socket_osd_container.results }}" with_items: "{{ socket_osd_container.results | default([]) }}"
when: when:
# We do not want to run these checks on initial deployment (`socket_osd_container.results[n].rc == 0`) # We do not want to run these checks on initial deployment (`socket_osd_container.results[n].rc == 0`)
# except when a crush location is specified. ceph-disk will start the osds before the osd crush location is specified # except when a crush location is specified. ceph-disk will start the osds before the osd crush location is specified
- containerized_deployment - containerized_deployment
- not item.get("skipped")
- ((crush_location is defined and crush_location) or item.get('rc') == 0) - ((crush_location is defined and crush_location) or item.get('rc') == 0)
- handler_health_osd_check - handler_health_osd_check
# See https://github.com/ceph/ceph-ansible/issues/1457 for the condition below # See https://github.com/ceph/ceph-ansible/issues/1457 for the condition below