From b9b12759174cd43a5cb05a40c115248829ddc34e Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Wed, 20 Nov 2019 18:05:32 +0200
Subject: [PATCH] Add ceph.conf override option

This commit implements option to partially override ceph.conf with regular
config_template action plugin.

Change-Id: I60cc9d3a4dde0483aa92714a521675a26ad9cd78
---
 defaults/main.yml                                          | 2 ++
 .../notes/ceph_ceph_conf_overrides-7b3a09ac34f94a6b.yaml   | 7 +++++++
 tasks/ceph_config.yml                                      | 4 +++-
 tests/ansible-role-requirements.yml                        | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/ceph_ceph_conf_overrides-7b3a09ac34f94a6b.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 3fd10d1..28656ce 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -104,3 +104,5 @@ ceph_extra_config_groups:
   - cinder_backup
   - cinder_volume
 ceph_extra_compute_group: nova_compute
+
+ceph_client_ceph_conf_overrides: "{{ ceph_conf_overrides | default({}) }}"
diff --git a/releasenotes/notes/ceph_ceph_conf_overrides-7b3a09ac34f94a6b.yaml b/releasenotes/notes/ceph_ceph_conf_overrides-7b3a09ac34f94a6b.yaml
new file mode 100644
index 0000000..ebbe902
--- /dev/null
+++ b/releasenotes/notes/ceph_ceph_conf_overrides-7b3a09ac34f94a6b.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added possibility to override ceph.conf partially by defining
+    `ceph_client_ceph_conf_overrides` variable. It uses regular format of
+    OpenStack-Ansible overrides.
+    From now on, config_template plugin should be present for ansible.
diff --git a/tasks/ceph_config.yml b/tasks/ceph_config.yml
index 90fbff3..65504ad 100644
--- a/tasks/ceph_config.yml
+++ b/tasks/ceph_config.yml
@@ -43,12 +43,14 @@
     - ceph_conf_file is defined
 
 - name: Create ceph.conf from mon host
-  copy:
+  config_template:
     content: '{{ ceph_conf }}'
     dest: /etc/ceph/ceph.conf
     owner:  root
     group:  root
     mode:   0644
+    config_type: ini
+    config_overrides: '{{ ceph_client_ceph_conf_overrides }}'
   notify:
     - Restart os services
 
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 2f1040b..6ca5700 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -3,3 +3,7 @@
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
   version: master
+- name: config_template
+  src: https://opendev.org/openstack/ansible-config_template
+  scm: git
+  version: master