diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-08-06 10:50:25 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-09-14 10:08:58 +0000 |
| commit | 797ecd6ddbadcc7a726ce1611c210667565d8a91 (patch) | |
| tree | acbb31f2af5f1fb0e1379ed8d1f09a83594a24eb /releasenotes | |
| parent | 5826e44d7b0f00eeda9dc3ccb68f2558a61a49f6 (diff) | |
| download | kolla-797ecd6ddbadcc7a726ce1611c210667565d8a91.tar.gz kolla-797ecd6ddbadcc7a726ce1611c210667565d8a91.zip | |
Fix kolla_set_configs --check with a directory
There are several issues with kolla_set_configs --check:
1. We calculate the destination path incorrectly when comparing a file
in a directory, due to passing arguments to os.path.relpath in the
wrong order
2. For directories that have not changed, we also attempt to compare
them as files, which fails when they are open()ed.
3. If the config JSON does not have a config_files key, it fails with a
KeyError.
The first two issues affect the fluentd container, which specifies
directories as the source, without using a glob. The third affects OVN
containers.
This patch fixes these issues.
Closes-Bug: #1890567
Change-Id: I8921befe51da4282121443849177a7ca5ebe8822
(cherry picked from commit c5320eb22386c34d83435fa0b9aa03b178996b52)
Diffstat (limited to 'releasenotes')
| -rw-r--r-- | releasenotes/notes/fix-config-check-c973c462761a4fa9.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/releasenotes/notes/fix-config-check-c973c462761a4fa9.yaml b/releasenotes/notes/fix-config-check-c973c462761a4fa9.yaml new file mode 100644 index 000000000..ee87646df --- /dev/null +++ b/releasenotes/notes/fix-config-check-c973c462761a4fa9.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with the ``kolla_set_configs --check`` command when the + source is a directory. `LP#1890567 + <https://bugs.launchpad.net/kolla/+bug/1890567>`__ |