Charm Helpers

Merge lp:~niedbalski/charm-helpers/fix-1442443 into lp:charm-helpers

  1. fix-1442443
  2. Merge into devel
Proposed by Jorge Niedbalski
Status: Merged
Merged at revision: 459
Proposed branch: lp:~niedbalski/charm-helpers/fix-1442443
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/utils.py (+1/-1)
To merge this branch: bzr merge lp:~niedbalski/charm-helpers/fix-1442443
Reviewer Review Type Date Requested Status
Billy Olsen Approve
charmers Pending
Review via email: mp+272649@code.launchpad.net

Description of the change

Fix for LP: #1442443

To post a comment you must log in.
Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM, this looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
2--- charmhelpers/contrib/openstack/amulet/utils.py 2015-09-01 18:00:00 +0000
3+++ charmhelpers/contrib/openstack/amulet/utils.py 2015-09-28 18:49:52 +0000
4@@ -752,7 +752,7 @@
5 self.log.debug('SSL is enabled @{}:{} '
6 '({})'.format(host, port, unit_name))
7 return True
8- elif not port and not conf_ssl:
9+ elif not conf_ssl:
10 self.log.debug('SSL not enabled @{}:{} '
11 '({})'.format(host, port, unit_name))
12 return False

Subscribers

People subscribed via source and target branches