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 <mv3@sanger.ac.uk>

diff --git a/roles/ceph-common/tasks/generate_ceph_conf.yml b/roles/ceph-common/tasks/generate_ceph_conf.yml
index 12b0bcfe5c79b5294b0cdcf491e06090ad12efad..c5d0b310dc78c4457d1d429ffd8d786a27d1e8a0 100644 (file)
--- 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"