Simplier solution used by the other charms

This commit is contained in:
Liam Young 2015-10-14 14:17:49 +00:00
parent 1f52dd9bf6
commit 8b5d8f2a87
2 changed files with 2 additions and 5 deletions

View File

@ -121,8 +121,6 @@ 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:

View File

@ -556,9 +556,8 @@ def do_openstack_upgrade(configs):
apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
apt_install(determine_packages(), fatal=True)
# Regenerate configs in full for new release
new_configs = register_configs()
new_configs.write_all()
configs.set_release(openstack_release=new_os_rel)
configs.write_all()
[service_restart(s) for s in services()]