Merge ~canonical-bootstack/charm-openstack-service-checks:fix/ssl_dependency into ~canonical-bootstack/charm-openstack-service-checks:master

Proposed by Andrea Ieri
Status: Merged
Approved by: Xav Paice
Approved revision: 6767ee2a20f46d21dae6924be81ac5263a1bc068
Merged at revision: d96322f33c7378d564a248902e416acde8cf1f4a
Proposed branch: ~canonical-bootstack/charm-openstack-service-checks:fix/ssl_dependency
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 21 lines (+2/-2)
1 file modified
reactive/service_checks.py (+2/-2)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+363805@code.launchpad.net

Commit message

Install the CA cert early

To post a comment you must log in.
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
Xav Paice (xavpaice) wrote :

lgtm +1

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

Change successfully merged at revision d96322f33c7378d564a248902e416acde8cf1f4a

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 5de3e51..5bd72c2 100644
3--- a/reactive/service_checks.py
4+++ b/reactive/service_checks.py
5@@ -173,6 +173,8 @@ def nrpe_connected(nem):
6 @when('os-service-checks.installed')
7 @when_not('os-service-checks.configured')
8 def render_config():
9+ if config.get('trusted_ssl_ca', None):
10+ fix_ssl()
11 creds = get_credentials()
12 if not creds:
13 hookenv.log('render_config: No credentials yet, skipping')
14@@ -182,8 +184,6 @@ def render_config():
15 render('nagios.novarc', NOVARC, creds,
16 owner='nagios', group='nagios')
17 render_checks()
18- if config.get('trusted_ssl_ca', None):
19- fix_ssl()
20 set_state('os-service-checks.configured')
21 remove_state('os-service-checks.started')
22

Subscribers

People subscribed via source and target branches

to all changes: