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

Proposed by Xav Paice
Status: Merged
Approved by: James Hebden
Approved revision: 1b5abbb9189f9b7e35c70641ff4e03f19554e329
Merged at revision: 25a0c65a5b54eef1cebc26ff6da79503ceb88b2f
Proposed branch: ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:fix_health_urls
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 14 lines (+1/-2)
1 file modified
reactive/service_checks.py (+1/-2)
Reviewer Review Type Date Requested Status
James Hebden (community) Approve
Review via email: mp+363761@code.launchpad.net

Commit message

Fix urls for healthchecks for Queens

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
James Hebden (ec0) wrote :

LGTM with the context that this is NOOP on versions less than Queens, and was busted on Queens to begin with.

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

Change successfully merged at revision 25a0c65a5b54eef1cebc26ff6da79503ceb88b2f

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 02a82d3..5de3e51 100644
3--- a/reactive/service_checks.py
4+++ b/reactive/service_checks.py
5@@ -222,8 +222,7 @@ def create_endpoint_checks():
6 health_check_params = {
7 'keystone': '/healthcheck',
8 's3': '/healthcheck',
9- 'swift': '/healthcheck',
10- 'aodh': '/ -e Unauthorized -d x-openstack-request-id',
11+ 'aodh': '/healthcheck',
12 'cinderv3': '/v3 -e Unauthorized -d x-openstack-request-id',
13 'cinderv2': '/v2 -e Unauthorized -d x-openstack-request-id',
14 'cinderv1': '/v1 -e Unauthorized -d x-openstack-request-id',

Subscribers

People subscribed via source and target branches