From 9363665019f64240a0ed4833392707ed59c927be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 8 Mar 2016 00:40:50 +0100 Subject: [PATCH] fix fragment for osd directory scenario MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- roles/ceph-osd/tasks/osd_fragment.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/roles/ceph-osd/tasks/osd_fragment.yml b/roles/ceph-osd/tasks/osd_fragment.yml index b219b6120..7c77be193 100644 --- a/roles/ceph-osd/tasks/osd_fragment.yml +++ b/roles/ceph-osd/tasks/osd_fragment.yml @@ -5,13 +5,29 @@ changed_when: false failed_when: false register: osd_path + when: not osd_directory - name: get osd id command: cat {{ item.stdout }}/whoami with_items: osd_path.results changed_when: false failed_when: false - register: osd_id + register: osd_id_non_dir_scenario + when: not osd_directory + +- name: get osd id for directory scenario + command: cat {{ item.stdout }}/whoami + with_items: osd_directories + changed_when: false + failed_when: false + register: osd_id_dir_scenario + when: osd_directory + +# NOTE (leseb): we must do this because of +# https://github.com/ansible/ansible/issues/4297 +- name: combine osd_path results + set_fact: + combined_osd_id: "{{ osd_id_non_dir_scenario if not osd_directory else osd_id_dir_scenario }}" - name: create a ceph fragment and assemble directory file: @@ -28,7 +44,7 @@ template: src: osd.conf.j2 dest: /etc/ceph/ceph.d/osd_fragments/osd.{{ item.stdout }}.conf - with_items: osd_id.results + with_items: combined_osd_id.results - name: copy ceph.conf for assembling command: cp /etc/ceph/ceph.conf /etc/ceph/ceph.d/