~openstack-charmers-archive/charms/trusty/percona-cluster/old-1410

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2014-10-22 09:25:03 UTC
  • mfrom: (37.1.4 respect-the-vip)
  • Revision ID: liam.young@canonical.com-20141022092503-onkpfn1kbc2bqth2
[gnuoy,r=jamespage] Ensure vip is always used if configured

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
        return True
140
140
    for r_id in relation_ids('identity-service'):
141
141
        for unit in relation_list(r_id):
 
142
            # TODO - needs fixing for new helper as ssl_cert/key suffixes with CN
142
143
            rel_state = [
143
144
                relation_get('https_keystone', rid=r_id, unit=unit),
144
 
                relation_get('ssl_cert', rid=r_id, unit=unit),
145
 
                relation_get('ssl_key', rid=r_id, unit=unit),
146
145
                relation_get('ca_cert', rid=r_id, unit=unit),
147
146
            ]
148
147
            # NOTE: works around (LP: #1203241)