From 2dc3514da59eaaf683166cb30ef9ab2a9bc83363 Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Tue, 7 Jun 2016 11:31:46 +0100 Subject: [PATCH] Make ansible managed line in swift.conf static The ansible-managed line includes date/time information, meaning that the conf file that gets laid down on different hosts does not have the same MD5 sum across all hosts. This causes swift-recon --md5 to fail. This commit fixes the issue by adding a static comment to the config file instead Change-Id: Id00cd79636f43776aaaa51e2ae6d7c5eacff8d34 Partial-Bug: #1589532 --- releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml | 9 +++++++++ templates/swift.conf.j2 | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml diff --git a/releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml b/releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml new file mode 100644 index 00000000..70ed36e2 --- /dev/null +++ b/releasenotes/notes/swift-conf-b8dd5e1199f8e4a8.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - Previously, the ``ansible_managed`` var was being + used to insert a header into the ``swift.conf`` that + contained date/time information. This meant that + swift.conf across different nodes did not have the + same MD5SUM, causing ``swift-recon --md5`` to break. + We now insert a piece of static text instead to + resolve this issue. diff --git a/templates/swift.conf.j2 b/templates/swift.conf.j2 index 59d40892..523c17ff 100644 --- a/templates/swift.conf.j2 +++ b/templates/swift.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +# Ansible managed - please don't edit this file manually [swift-hash] swift_hash_path_suffix = {{ swift_hash_path_suffix }}