Merge ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:nova-fix into ~canonical-bootstack/charm-openstack-service-checks:master

Proposed by Xav Paice
Status: Merged
Approved by: James Hebden
Approved revision: 02a7dfa808de6ed11c5396ee438fbb9e71b78fe3
Merged at revision: 02a7dfa808de6ed11c5396ee438fbb9e71b78fe3
Proposed branch: ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:nova-fix
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/service_checks.py (+1/-1)
Reviewer Review Type Date Requested Status
James Hebden Pending
Review via email: mp+341792@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/service_checks.py b/reactive/service_checks.py
2index c60adf6..f202d69 100644
3--- a/reactive/service_checks.py
4+++ b/reactive/service_checks.py
5@@ -140,7 +140,7 @@ def render_checks():
6 skip_disabled = config.get("skip-disabled")
7
8 check_command = plugins_dir + 'check_nova_services.py --warn ' \
9- + str(warn) + 'crit' + str(crit)
10+ + str(warn) + ' --crit ' + str(crit)
11
12 if skip_disabled:
13 check_command = check_command + '--skip-disabled'

Subscribers

People subscribed via source and target branches