← Back to branch summary

~hopem/charms/trusty/glance/fix-ssl-disable

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/hahelpers/cluster.py

  • Committer: Edward Hope-Morley
  • Date: 2015-02-24 11:03:59 UTC
  • Revision ID: edward.hope-morley@canonical.com-20150224110359-jj3g2d044lk8uy69
[trivial] charmhelpers sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/hahelpers/cluster.py
48
48
from charmhelpers.core.decorators import (
49
49
    retry_on_exception,
50
50
)
 
51
from charmhelpers.core.strutils import (
 
52
    bool_from_string,
 
53
)
51
54
 
52
55
 
53
56
class HAIncompleteConfig(Exception):
164
167
    .
165
168
    returns: boolean
166
169
    '''
167
 
    if config_get('use-https') == "yes":
 
170
    use_https = config_get('use-https')
 
171
    if use_https and bool_from_string(use_https):
168
172
        return True
169
173
    if config_get('ssl_cert') and config_get('ssl_key'):
170
174
        return True