Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions etc/kayobe/ansible/cephadm-gather-keys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
# Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf.
content: |
{{ cephadm_ceph_conf.stdout | regex_replace('\t') }}
{{ kolla_ceph_conf_append if kolla_ceph_conf_append is defined }}
dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_conf_dir[item.0.name] }}/ceph.conf"
loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}"
loop_control:
Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/cephadm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,6 @@ kolla_ceph_manila_required: "{{ kolla_enable_manila | bool }}"

# Whether to generate Ceph configuration for Nova.
kolla_ceph_nova_required: "{{ kolla_enable_nova | bool }}"

# A (multiline) string to append to all Ceph configuration files.
#kolla_ceph_conf_append:
6 changes: 6 additions & 0 deletions releasenotes/notes/ceph-config-append-1cc6146d3241b63e.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
features:
- |
Add ``kolla_ceph_conf_append`` configuration option to specify a string
to be appended to all ceph.conf files gathered from a ceph cluster using
``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-gather-keys.yml``.
Loading