openstack
/
kolla-ansible
Code Issues Proposed changes

Fix swift.conf custom configuration path collision 

Both swift.conf and proxy-server.conf are affected be
/etc/kolla/config/swift/proxy-server.conf. However, some options in
proxy-server.conf are not valid in swift.conf.

This change keeps this path for proxy-server.conf, but modifies the path
for swift.conf to /etc/kolla/config/swift/proxy-server/swift.conf. The
same applies for other services, object-*, account-*, container-*.

Change-Id: I600891a15244ce705861f6ec93eec1d5ba83c1b8
Closes-Bug: #1849265
This commit is contained in:
Mark Goddard 2019-10-24 09:31:17 +01:00
parent 160af32c2c
commit 86ccefc623
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/swift/tasks/config.yml
View File

@ -62,8 +62,8 @@
- "{{ role_path }}/templates/swift.conf.j2"
- "{{ node_custom_config }}/global.conf"
- "{{ node_custom_config }}/swift.conf"
- "{{ node_custom_config }}/swift/{{ item }}.conf"
- "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
- "{{ node_custom_config }}/swift/{{ item }}/swift.conf"
- "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}/swift.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf"
mode: "0660"
become: true

8
releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
Modifies the path for custom configuration of ``swift.conf`` from
``/etc/kolla/config/swift/<service>.conf`` to
``/etc/kolla/config/swift/<service>/swift.conf``, to avoid a collision with
custom configuration for ``<service>.conf``. Here, ``<service>`` may be
``proxy-server``, ``account-*``, ``container-*`` or ``object-*``.