commit 11cf61ba11041aad60b3fb5c4d949aa491fabcb5
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.
Reviewed: https:/ /review. openstack. org/620023 /git.openstack. org/cgit/ openstack/ charm-swift- proxy/commit/ ?id=11cf61ba110 41aad60b3fb5c4d 949aa491fabcb5
Committed: https:/
Submitter: Zuul
Branch: stable/18.11
commit 11cf61ba11041aa d60b3fb5c4d949a a491fabcb5
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 nrpe_checks( ) function in c-h. c-h has been updated, to look in
CHARMDIR rather than in CHARMDIR/hooks. This broke the
copy_
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 CalledProcessEr ror() formats strings
difference between how subprocess.
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: I845169c839bd20 58e10076f24bf53 93db0ec218a
Closes-Bug: #1796830