commit a50f723589a7389e3ab2853db05982a47cee92d5 Author: nikparasyr Date: Tue Oct 6 20:43:52 2020 +0200 Allow overwrite of placement-api wsgi config Use with_first_found on placement-api-wsgi to allow overwrite from users and keep consistency with other roles. Change-Id: I11c84db6df1bb5be61db5b6b0adf8c160a2bd931 Closes-Bug: #1898766 (cherry picked from commit fc4327d946220db2a96691c955e72114fee8a850) diff --git a/ansible/roles/placement/tasks/config.yml b/ansible/roles/placement/tasks/config.yml index 7f1cf33..3d2acac 100644 --- a/ansible/roles/placement/tasks/config.yml +++ b/ansible/roles/placement/tasks/config.yml @@ -67,12 +67,16 @@ vars: service: "{{ placement_services['placement-api'] }}" template: - src: "placement-api-wsgi.conf.j2" + src: "{{ item }}" dest: "{{ node_config_directory }}/placement-api/placement-api-wsgi.conf" mode: "0660" when: - inventory_hostname in groups[service.group] - service.enabled | bool + with_first_found: + - "{{ node_custom_config }}/placement/{{ inventory_hostname }}/placement-api-wsgi.conf" + - "{{ node_custom_config }}/placement/placement-api-wsgi.conf" + - "placement-api-wsgi.conf.j2" notify: - Restart placement-api container diff --git a/releasenotes/notes/bug-1898766-ffc55c97230d8221.yaml b/releasenotes/notes/bug-1898766-ffc55c97230d8221.yaml new file mode 100644 index 0000000..4a980f0 --- /dev/null +++ b/releasenotes/notes/bug-1898766-ffc55c97230d8221.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Add with_first_found on placement for placement-api wsgi configuration + to allow overwrite from users. + `LP#1898766 `__