diff --git a/ansible/roles/skydive/tasks/config.yml b/ansible/roles/skydive/tasks/config.yml index fe08155964..6fb80e2805 100644 --- a/ansible/roles/skydive/tasks/config.yml +++ b/ansible/roles/skydive/tasks/config.yml @@ -30,8 +30,12 @@ - Restart {{ item.key }} container - name: Copying over skydive config file - template: - src: "{{ item.key }}.conf.j2" + merge_yaml: + sources: + - "{{ role_path }}/templates/{{ item.key }}.conf.j2" + - "{{ node_custom_config }}/skydive.conf" + - "{{ node_custom_config }}/skydive/{{ item.key }}.conf" + - "{{ node_custom_config }}/skydive/{{ inventory_hostname }}/{{ item.key }}.conf" dest: "{{ node_config_directory }}/{{ item.key }}/skydive.conf" mode: "0660" become: true diff --git a/releasenotes/notes/skydive-custom-config-4f9f523cf72acaba.yaml b/releasenotes/notes/skydive-custom-config-4f9f523cf72acaba.yaml new file mode 100644 index 0000000000..73d22c83e7 --- /dev/null +++ b/releasenotes/notes/skydive-custom-config-4f9f523cf72acaba.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Adds a mechanism to customize ``skydive.conf``.