openstack/charm-neutron-api
Code Issues Proposed changes

Move apt-install after do_openstack_upgrade to avoid clash

Browse Source
This commit is contained in:
Liam Young 2015-04-20 15:11:30 +01:00
parent c6d6df5006
commit affe9a883d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/neutron_api_hooks.py
View File

@ -141,9 +141,6 @@ def config_changed():
' remove any distributed routers')
log(e, level=ERROR)
raise Exception(e)
apt_install(filter_installed_packages(
determine_packages(config('openstack-origin'))),
fatal=True)
if config('prefer-ipv6'):
setup_ipv6()
sync_db_with_multi_ipv6_addresses(config('database'),
@ -156,6 +153,10 @@ def config_changed():
else:
if openstack_upgrade_available('neutron-server'):
do_openstack_upgrade(CONFIGS)
apt_install(filter_installed_packages(
determine_packages(config('openstack-origin'))),
fatal=True)
configure_https()
update_nrpe_config()
CONFIGS.write_all()