From: Matthew Vernon Date: Tue, 11 Apr 2017 13:33:21 +0000 (+0100) Subject: Only include cluster.conf and osd.conf when building ceph.conf X-Git-Tag: v2.3.0rc1~55^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1431%2Fhead;p=ceph-ansible.git Only include cluster.conf and osd.conf when building ceph.conf This is the same fix as bc846b7da6d9af16d9611fef7f00df6557f19def applied to the other part of the code-base that builds ceph.conf (I'd missed that 349b9ab3e72f188c50b5f84f3ce5ee2fddcfbf80 had duplicated this code). Signed-off-by: Matthew Vernon --- diff --git a/roles/ceph-common/tasks/generate_ceph_conf.yml b/roles/ceph-common/tasks/generate_ceph_conf.yml index 12b0bcfe5..c5d0b310d 100644 --- a/roles/ceph-common/tasks/generate_ceph_conf.yml +++ b/roles/ceph-common/tasks/generate_ceph_conf.yml @@ -25,6 +25,7 @@ assemble: src: /etc/ceph/ceph.d/ dest: /etc/ceph/{{ cluster }}.conf + regexp: "^(({{cluster}})|(osd)).conf$" owner: "ceph" group: "ceph" mode: "0644"