Comment 14 for bug 1796830

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to charm-swift-proxy (master)

Reviewed: https://review.openstack.org/619773
Committed: https://git.openstack.org/cgit/openstack/charm-swift-proxy/commit/?id=96741629b4d22d7102fe9a3fe6e3de3e45ab9df1
Submitter: Zuul
Branch: master

commit 96741629b4d22d7102fe9a3fe6e3de3e45ab9df1
Author: Alex Kavanagh <email address hidden>
Date: Fri Nov 23 17:03:23 2018 +0000

    Sync c-h nrpe.py file to fix nrpe files copy issue

    Due to a change to PY3, the charmhelpers directory is not in the
    CHARMDIR rather than in CHARMDIR/hooks. This broke the
    copy_nrpe_checks() function in c-h. c-h has been updated, to look in
    both CHARMDIR and CHARMDIR/hooks for the charmhelpers directory, and
    this patchset includes the new function definition.

    Note: the change in unit_tests/test_actions.py is to cope with a
    difference between how subprocess.CalledProcessError() formats strings
    when using str() between py35 and py36. Python3.6 adds a period/dot to
    the end of the sentence that Python3.5 didn't.

    Change-Id: I8ebb1d6d78f0804007a9f79f31b3b0c4e0c441bd
    Closes-Bug: #1796830