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

Proposed by Xav Paice
Status: Merged
Approved by: Andrea Ieri
Approved revision: 4d5c0eb67dfb1ff9bc3f8303dd72aad8f521438f
Merged at revision: a2abf4ef6776ef99f1b132afc4d6cd471c7db7ac
Proposed branch: ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:lp1818120
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/service_checks.py (+1/-1)
Reviewer Review Type Date Requested Status
Andrea Ieri (community) Approve
Review via email: mp+363817@code.launchpad.net

Commit message

Strip quotes from auth_url if specified

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
Andrea Ieri (aieri) wrote :

lgtm

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

Change successfully merged at revision a2abf4ef6776ef99f1b132afc4d6cd471c7db7ac

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 5bd72c2..1b87f20 100644
3--- a/reactive/service_checks.py
4+++ b/reactive/service_checks.py
5@@ -94,7 +94,7 @@ def get_credentials():
6 'username': ident_creds['username'],
7 'password': ident_creds['password'],
8 'region': ident_creds['region_name'],
9- 'auth_url': ident_creds['auth_url'],
10+ 'auth_url': ident_creds['auth_url'].strip('\"\''),
11 }
12 if '/v3' in ident_creds['auth_url']:
13 creds.update({

Subscribers

People subscribed via source and target branches