Merge ~xavpaice/charm-nrpe:1970360 into charm-nrpe:master

Proposed by Xav Paice
Status: Merged
Merged at revision: 58db26e052c5824cd19224c95accf9f22e331961
Proposed branch: ~xavpaice/charm-nrpe:1970360
Merge into: charm-nrpe:master
Diff against target: 12 lines (+1/-0)
1 file modified
hooks/nrpe_utils.py (+1/-0)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+420532@code.launchpad.net

Commit message

update mode of nagios_plugin3.py

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Xav Paice (xavpaice) wrote :

https://bugs.launchpad.net/juju/+bug/1969470 causing CI failures, I've implemented the workaround.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/nrpe_utils.py b/hooks/nrpe_utils.py
2index 71e0790..dcad8a2 100644
3--- a/hooks/nrpe_utils.py
4+++ b/hooks/nrpe_utils.py
5@@ -94,6 +94,7 @@ def install_charm_files(service_name):
6 os.path.join(charm_file_dir, "nagios_plugin3.py"),
7 pkg_plugin_dir + "/nagios_plugin3.py",
8 )
9+ os.chmod(pkg_plugin_dir + "/nagios_plugin3.py", 0o644)
10
11 if hookenv.config("export_nagios_definitions"):
12 shutil.copy2(

Subscribers

People subscribed via source and target branches

to all changes: