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

[Alvaro Uria]

Add Barbican/Gnocchi/Heat health checks

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Alvaro Uria (aluria)]

Unit and functional tests pass.

[Andrea Ieri (aieri)]

lgtm +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision dc165929694fdc0ed5e7dd1dc22ff6d0f462e60e

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():
         # This also provides a nasty hack-ish way to add switches if we need
         # for some services.
         health_check_params = {
-            'keystone': '/healthcheck',
-            's3': '/healthcheck',
             'aodh': '/healthcheck',
+            'barbican': '/ -e Unauthorized -d x-openstack-request-id',
             'ceilometer': '/ -e Unauthorized -d x-openstack-request-id',
-            'cinderv3': '/v3 -e Unauthorized -d x-openstack-request-id',
-            'cinderv2': '/v2 -e Unauthorized -d x-openstack-request-id',
             'cinderv1': '/v1 -e Unauthorized -d x-openstack-request-id',
+            'cinderv2': '/v2 -e Unauthorized -d x-openstack-request-id',
+            'cinderv3': '/v3 -e Unauthorized -d x-openstack-request-id',
             'glance': '/healthcheck',
+            'gnocchi': '/ -e Unauthorized -d x-openstack-request-id',
+            'heat': '/v1 -e Unauthorized -d x-openstack-request-id',
+            'heat-cfn': '/v1 -e Unauthorized -d x-openstack-request-id',
+            'keystone': '/healthcheck',
             'nova': '/healthcheck',
             'placement': '/healthcheck -e Unauthorized -d x-openstack-request-id',
+            's3': '/healthcheck',
             'swift': self.charm_config.get('swift_check_params', '/'),
             }
         keystone_client = self.get_keystone_client(creds)