fix fragment for osd directory scenario

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/609/head
Sébastien Han 2016-03-08 00:40:50 +01:00
parent b354445914
commit 9363665019
1 changed files with 18 additions and 2 deletions

View File

@ -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/