Comment 8 for bug 1890567

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to kolla (stable/train)

Reviewed: https://review.opendev.org/751727
Committed: https://git.openstack.org/cgit/openstack/kolla/commit/?id=797ecd6ddbadcc7a726ce1611c210667565d8a91
Submitter: Zuul
Branch: stable/train

commit 797ecd6ddbadcc7a726ce1611c210667565d8a91
Author: Mark Goddard <email address hidden>
Date: Thu Aug 6 10:50:25 2020 +0100

    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)