Merge "Render ceph.conf using merge_configs"

ansible/roles/cinder/tasks/ceph.yml

@@ -8,9 +8,14 @@
     - "cinder-backup"
   when: inventory_hostname in groups['cinder-volume']
 
-- name: Copying over config(s)
-  template:
-    src: roles/ceph/templates/ceph.conf.j2
+- name: Copying over ceph.conf(s)
+  merge_configs:
+    vars:
+      service_name: "{{ item }}"
+    sources:
+      - "{{ role_path }}/../ceph/templates/ceph.conf.j2"
+      - "{{ node_custom_config }}/ceph.conf"
+      - "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
     dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
   with_items:
     - "cinder-volume"

ansible/roles/glance/tasks/ceph.yml

@@ -5,9 +5,12 @@
     state: "directory"
   when: inventory_hostname in groups['glance-api']
 
-- name: Copying over config(s)
-  template:
-    src: roles/ceph/templates/ceph.conf.j2
+- name: Copying over ceph.conf(s)
+  merge_configs:
+    sources:
+      - "{{ role_path }}/../ceph/templates/ceph.conf.j2"
+      - "{{ node_custom_config }}/ceph.conf"
+      - "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
     dest: "{{ node_config_directory }}/glance-api/ceph.conf"
   when: inventory_hostname in groups['glance-api']
 

ansible/roles/gnocchi/tasks/ceph.yml

@@ -9,9 +9,14 @@
     - "gnocchi-metricd"
     - "gnocchi-statsd"
 
-- name: Copying over config(s)
-  template:
-    src: roles/ceph/templates/ceph.conf.j2
+- name: Copying over ceph.conf(s)
+  merge_configs:
+    vars:
+      service_name: "{{ item }}"
+    sources:
+      - "{{ role_path }}/../ceph/templates/ceph.conf.j2"
+      - "{{ node_custom_config }}/ceph.conf"
+      - "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
     dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
   when: inventory_hostname in groups[item]
   with_items:

ansible/roles/nova/tasks/ceph.yml

@@ -8,9 +8,14 @@
     - "nova-libvirt/secrets"
   when: inventory_hostname in groups['compute']
 
-- name: Copying over config(s)
-  template:
-    src: roles/ceph/templates/ceph.conf.j2
+- name: Copying over ceph.conf(s)
+  merge_configs:
+    vars:
+      service_name: "{{ item }}"
+    sources:
+      - "{{ role_path }}/../ceph/templates/ceph.conf.j2"
+      - "{{ node_custom_config }}/ceph.conf"
+      - "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
     dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
   with_items:
     - "nova-compute"