← Back to branch summary

~james-page/charms/trusty/cinder/network-splits

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2014-07-16 13:35:25 UTC
  • Revision ID: james.page@ubuntu.com-20140716133525-c7xhuctcq71hdjjd
Resync helpers, drop surplus vip config

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/hahelpers/cluster.py
146
146
    Obtains all relevant configuration from charm configuration required
147
147
    for initiating a relation to hacluster:
148
148
 
149
 
        ha-bindiface, ha-mcastport, vip, vip_iface, vip_cidr
 
149
        ha-bindiface, ha-mcastport, vip
150
150
 
151
151
    returns: dict: A dict containing settings keyed by setting name.
152
152
    raises: HAIncompleteConfig if settings are missing.
153
153
    '''
154
 
    settings = ['ha-bindiface', 'ha-mcastport', 'vip', 'vip_iface', 'vip_cidr']
 
154
    settings = ['ha-bindiface', 'ha-mcastport', 'vip']
155
155
    conf = {}
156
156
    for setting in settings:
157
157
        conf[setting] = config_get(setting)