← Back to branch summary

~openstack-charmers-next/charms/xenial/nova-cloud-controller/trunk

« back to all changes in this revision

Viewing changes to hooks/nova_cc_hooks.py

  • Committer: Gerrit Code Review
  • Author(s): Jenkins
  • Date: 2016-06-14 19:21:37 UTC
  • mfrom: (245.1.1 trunk)
  • Revision ID: review@openstack.org-20160614192137-hm144g5loetxsc6q
Merge "Fix for status-set race - related to bug 1588462"

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_cc_hooks.py
49
49
    os_release,
50
50
    os_requires_version,
51
51
    sync_db_with_multi_ipv6_addresses,
52
 
    set_os_workload_status,
53
52
    pausable_restart_on_change as restart_on_change,
54
53
    is_unit_paused_set,
55
54
)
96
95
    guard_map,
97
96
    get_topics,
98
97
    setup_ipv6,
99
 
    REQUIRED_INTERFACES,
100
 
    check_optional_relations,
101
98
    is_db_initialised,
 
99
    assess_status,
102
100
)
103
101
 
104
102
from charmhelpers.contrib.hahelpers.cluster import (
1068
1066
        hooks.execute(sys.argv)
1069
1067
    except UnregisteredHookError as e:
1070
1068
        log('Unknown hook {} - skipping.'.format(e))
1071
 
    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
1072
 
                           charm_func=check_optional_relations)
 
1069
    assess_status(CONFIGS)
1073
1070
 
1074
1071
if __name__ == '__main__':
1075
1072
    main()