From 86ccefc6233c52a083ccdbec23011d528a999964 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 24 Oct 2019 09:31:17 +0100
Subject: [PATCH] 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
---
ansible/roles/swift/tasks/config.yml | 4 ++--
.../notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml
diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
index 1fd6981fc..40c757a85 100644
--- a/ansible/roles/swift/tasks/config.yml
+++ b/ansible/roles/swift/tasks/config.yml
@@ -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
diff --git a/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml b/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml
new file mode 100644
index 000000000..b383ef855
--- /dev/null
+++ b/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml
@@ -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-*``.
--
GitLab