Merge ~aluria/charm-openstack-service-checks/+git/charm-openstack-service-checks:bug/1789672 into ~canonical-bootstack/charm-openstack-service-checks:master

Proposed by Alvaro Uria
Status: Merged
Approved by: Andrea Ieri
Approved revision: d1c0083555b87c437b244b683427ae41063833a6
Merged at revision: dc165929694fdc0ed5e7dd1dc22ff6d0f462e60e
Proposed branch: ~aluria/charm-openstack-service-checks/+git/charm-openstack-service-checks:bug/1789672
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 29 lines (+8/-4)
1 file modified
lib/lib_openstack_service_checks.py (+8/-4)
Reviewer Review Type Date Requested Status
Andrea Ieri (community) Approve
Legacy - Canonical WTFB Pending
Review via email: mp+366167@code.launchpad.net

Commit message

Add Barbican/Gnocchi/Heat health checks

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
Alvaro Uria (aluria) wrote :

Unit and functional tests pass.

Revision history for this message
Andrea Ieri (aieri) wrote :

lgtm +1

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

Change successfully merged at revision dc165929694fdc0ed5e7dd1dc22ff6d0f462e60e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/lib/lib_openstack_service_checks.py b/lib/lib_openstack_service_checks.py
index 563d09c..2c99366 100644
--- a/lib/lib_openstack_service_checks.py
+++ b/lib/lib_openstack_service_checks.py
@@ -157,16 +157,20 @@ class OSCHelper():
157 # This also provides a nasty hack-ish way to add switches if we need157 # This also provides a nasty hack-ish way to add switches if we need
158 # for some services.158 # for some services.
159 health_check_params = {159 health_check_params = {
160 'keystone': '/healthcheck',
161 's3': '/healthcheck',
162 'aodh': '/healthcheck',160 'aodh': '/healthcheck',
161 'barbican': '/ -e Unauthorized -d x-openstack-request-id',
163 'ceilometer': '/ -e Unauthorized -d x-openstack-request-id',162 'ceilometer': '/ -e Unauthorized -d x-openstack-request-id',
164 'cinderv3': '/v3 -e Unauthorized -d x-openstack-request-id',
165 'cinderv2': '/v2 -e Unauthorized -d x-openstack-request-id',
166 'cinderv1': '/v1 -e Unauthorized -d x-openstack-request-id',163 'cinderv1': '/v1 -e Unauthorized -d x-openstack-request-id',
164 'cinderv2': '/v2 -e Unauthorized -d x-openstack-request-id',
165 'cinderv3': '/v3 -e Unauthorized -d x-openstack-request-id',
167 'glance': '/healthcheck',166 'glance': '/healthcheck',
167 'gnocchi': '/ -e Unauthorized -d x-openstack-request-id',
168 'heat': '/v1 -e Unauthorized -d x-openstack-request-id',
169 'heat-cfn': '/v1 -e Unauthorized -d x-openstack-request-id',
170 'keystone': '/healthcheck',
168 'nova': '/healthcheck',171 'nova': '/healthcheck',
169 'placement': '/healthcheck -e Unauthorized -d x-openstack-request-id',172 'placement': '/healthcheck -e Unauthorized -d x-openstack-request-id',
173 's3': '/healthcheck',
170 'swift': self.charm_config.get('swift_check_params', '/'),174 'swift': self.charm_config.get('swift_check_params', '/'),
171 }175 }
172 keystone_client = self.get_keystone_client(creds)176 keystone_client = self.get_keystone_client(creds)

Subscribers

People subscribed via source and target branches