openstack
/
charm-nova-compute
Code Issues Proposed changes

Refresh configs after upgrade to ensure the correct templates are used

This commit is contained in:
Liam Young 2015-10-14 14:08:38 +00:00
parent 755227724d
commit 1f52dd9bf6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/nova_compute_hooks.py
View File

@ -121,6 +121,8 @@ def config_changed():
if openstack_upgrade_available('nova-common'):
status_set('maintenance', 'Running openstack upgrade')
do_openstack_upgrade(CONFIGS)
# Refresh configs templates as os release has changed
CONFIGS = register_configs()
sysctl_dict = config('sysctl')
if sysctl_dict:

3
hooks/nova_compute_utils.py
View File

@ -557,7 +557,8 @@ def do_openstack_upgrade(configs):
apt_install(determine_packages(), fatal=True)
# Regenerate configs in full for new release
configs.write_all()
new_configs = register_configs()
new_configs.write_all()
[service_restart(s) for s in services()]

2
templates/juno/nova.conf
View File

@ -1,4 +1,4 @@
# havana
# juno
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.