Merge pull request #33 from cityofships/multiyaml

Fix templating multi-document OSD specs

Author: cityofships

roles/cephadm/README.md

@@ -48,10 +48,10 @@ All Ceph hosts must be in the `ceph` group.
             - /dev/sdb
             - /dev/sdc
       ```
-    * `cephadm_osd_spec`: OSD spec to apply in yaml format
+    * `cephadm_osd_spec`: OSD spec to apply in YAML (recommended) or dict format
       Example:
       ```
-          cephadm_osd_spec:
+          cephadm_osd_spec: |
             service_type: osd
             service_id: osd_spec_default
             placement:

roles/cephadm/tasks/osds.yml

@@ -19,7 +19,7 @@
     vars:
       fsid: "{{ cephadm_fsid if cephadm_fsid | length > 0 else cephadm_fsid_current.stdout }}"
     copy:
-      content: "{{ cephadm_osd_spec | to_nice_yaml(indent=2) }}"
+      content: "{{ cephadm_osd_spec | to_nice_yaml if cephadm_osd_spec is mapping else cephadm_osd_spec }}"
       dest: "/var/run/ceph/{{ fsid }}/osd_spec.yml"
       owner: root
       group: root