]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Common: Avoid duplicate section in ceph.conf
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 2 Jun 2017 08:06:19 +0000 (10:06 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 19 Jul 2017 09:50:03 +0000 (11:50 +0200)
See:
 - https://github.com/ceph/ceph-ansible/pull/1018#issuecomment-253491094
 - https://github.com/ceph/ceph-ansible/pull/1018#issuecomment-260276588

The workaround here is rendering `ceph_conf_overrides` before passing it
to `config_template` to be sure we won't have a section added twice in
ceph.conf

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-common/tasks/generate_ceph_conf.yml

index c5d0b310dc78c4457d1d429ffd8d786a27d1e8a0..f23a485d952a9d89857521d9db7d01c9fea22551 100644 (file)
     - /etc/ceph/
     - /etc/ceph/ceph.d/
 
+- name: template ceph_conf_overrides
+  local_action: copy content="{{ ceph_conf_overrides }}" dest=/tmp/ceph_conf_overrides_temp
+  run_once: true
+
+- name: get rendered ceph_conf_overrides
+  local_action: set_fact ceph_conf_overrides_rendered="{{ lookup('template', '/tmp/ceph_conf_overrides_temp') | from_yaml }}"
+  run_once: true
+
 - name: "generate ceph configuration file: {{ cluster }}.conf"
   action: config_template
   args:
@@ -18,7 +26,7 @@
     owner: "ceph"
     group: "ceph"
     mode: "0644"
-    config_overrides: "{{ ceph_conf_overrides }}"
+    config_overrides: "{{ ceph_conf_overrides_rendered }}"
     config_type: ini
 
 - name: assemble {{ cluster }}.conf and fragments