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
diff --git a/reactive/service_checks.py b/reactive/service_checks.py
index 5de3e51..5bd72c2 100644
--- a/reactive/service_checks.py
+++ b/reactive/service_checks.py
@@ -173,6 +173,8 @@ def nrpe_connected(nem):
173@when('os-service-checks.installed')173@when('os-service-checks.installed')
174@when_not('os-service-checks.configured')174@when_not('os-service-checks.configured')
175def render_config():175def render_config():
176 if config.get('trusted_ssl_ca', None):
177 fix_ssl()
176 creds = get_credentials()178 creds = get_credentials()
177 if not creds:179 if not creds:
178 hookenv.log('render_config: No credentials yet, skipping')180 hookenv.log('render_config: No credentials yet, skipping')
@@ -182,8 +184,6 @@ def render_config():
182 render('nagios.novarc', NOVARC, creds,184 render('nagios.novarc', NOVARC, creds,
183 owner='nagios', group='nagios')185 owner='nagios', group='nagios')
184 render_checks()186 render_checks()
185 if config.get('trusted_ssl_ca', None):
186 fix_ssl()
187 set_state('os-service-checks.configured')187 set_state('os-service-checks.configured')
188 remove_state('os-service-checks.started')188 remove_state('os-service-checks.started')
189189

Subscribers

People subscribed via source and target branches

to all changes: