openstack
/
charm-nova-compute
Code Issues Proposed changes

Merge "Trigger ceilometer-agent after upgrade"

This commit is contained in:
Zuul 2018-11-12 16:52:38 +00:00 committed by Gerrit Code Review
parent f60aa4a8fb fdfabc2ef3
commit b681a5652a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/nova_compute_hooks.py
View File

@ -214,6 +214,9 @@ def config_changed():
for rid in relation_ids('neutron-plugin'):
neutron_plugin_joined(rid, remote_restart=send_remote_restart)
for rid in relation_ids('nova-ceilometer'):
nova_ceilometer_joined(rid, remote_restart=send_remote_restart)
if is_relation_made("nrpe-external-master"):
update_nrpe_config()
@ -437,6 +440,14 @@ def upgrade_charm():
shutil.chown(asok_path, group='kvm')
@hooks.hook('nova-ceilometer-relation-joined')
def nova_ceilometer_joined(relid=None, remote_restart=False):
if remote_restart:
rel_settings = {
'restart-trigger': str(uuid.uuid4())}
relation_set(relation_id=relid, relation_settings=rel_settings)
@hooks.hook('nova-ceilometer-relation-changed')
@restart_on_change(restart_map())
def nova_ceilometer_relation_changed():