Skip to content

Commit 097fe76

Browse files
committed
Fix templating multi-document OSD specs
1 parent 26fbf13 commit 097fe76

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/cephadm/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ Role variables
4343
- /dev/sdb
4444
- /dev/sdc
4545
```
46-
* `cephadm_osd_spec`: OSD spec to apply in yaml format
46+
* `cephadm_osd_spec`: OSD spec to apply in YAML (recommended) or dict format
4747
Example:
4848
```
49-
cephadm_osd_spec:
49+
cephadm_osd_spec: |
5050
service_type: osd
5151
service_id: osd_spec_default
5252
placement:
@@ -56,7 +56,7 @@ Role variables
5656
db_devices:
5757
model: Dell Express Flash PM1725b 1.6TB SFF
5858
```
59-
59+
6060
* Registry
6161
* `cephadm_registry_url`: (default: not used)
6262
* `cephadm_registry_username`: (default: not used)

roles/cephadm/tasks/osds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
vars:
2020
fsid: "{{ cephadm_fsid if cephadm_fsid | length > 0 else cephadm_fsid_current.stdout }}"
2121
copy:
22-
content: "{{ cephadm_osd_spec | to_nice_yaml(indent=2) }}"
22+
content: "{{ cephadm_osd_spec | to_nice_yaml if cephadm_osd_spec is mapping else cephadm_osd_spec }}"
2323
dest: "/var/run/ceph/{{ fsid }}/osd_spec.yml"
2424
owner: root
2525
group: root

0 commit comments

Comments
 (0)