← Back to branch summary

~ajkavanagh/openstack-mojo-specs/remove-cinder-from-vrrp-ha

« back to all changes in this revision

Viewing changes to helper/utils/kiki.py

Additional fixes re: juju status

Show diffs side-by-side

added added

removed removed

Lines of Context:
helper/utils/kiki.py
257
257
    @returns string Juju identifier for juju-state
258
258
    """
259
259
    if min_version('2.1'):
260
 
        return "juju-state"
 
260
        return "juju-status"
261
261
    else:
262
262
        return "agent-state"
263
263
 
264
264
 
 
265
def get_unit_info_state(unit_info):
 
266
    """Translate juju unit information
 
267
 
 
268
    @param unit_info: Dictionary of unit information
 
269
    @returns string Juju unit information state
 
270
    """
 
271
 
 
272
    if min_version('2.1'):
 
273
        return unit_info[juju_state()]['current']
 
274
    else:
 
275
        return unit_info['agent-state']
 
276
 
 
277
 
265
278
@cached
266
279
def actions():
267
280
    """Translate argument for actions