openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix swift.conf custom configuration path collision" into stable/stein

Browse Source
This commit is contained in:
Zuul 2019-11-11 16:34:30 +00:00 committed by Gerrit Code Review
commit 3bc9050964
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" - "{{ role_path }}/templates/swift.conf.j2"
- "{{ node_custom_config }}/global.conf" - "{{ node_custom_config }}/global.conf"
- "{{ node_custom_config }}/swift.conf" - "{{ node_custom_config }}/swift.conf"
- "{{ node_custom_config }}/swift/{{ item }}.conf" - "{{ node_custom_config }}/swift/{{ item }}/swift.conf"
- "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf" - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}/swift.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf"
mode: "0660" mode: "0660"
become: true 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-*``.