← Back to branch summary

~landscape/charms/trusty/neutron-api/trunk

« back to all changes in this revision

Viewing changes to hooks/neutron_api_hooks.py

  • Committer: Liam Young
  • Date: 2015-04-20 16:10:39 UTC
  • mfrom: (104.1.1 neutron-api-next)
  • Revision ID: liam.young@canonical.com-20150420161039-ng9kzncwo5kh5bb8
[gnuoy,r=corey.bryant] 

    Move apt-install after do_openstack_upgrade to avoid clash

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/neutron_api_hooks.py
141
141
             ' remove any distributed routers')
142
142
        log(e, level=ERROR)
143
143
        raise Exception(e)
144
 
    apt_install(filter_installed_packages(
145
 
                determine_packages(config('openstack-origin'))),
146
 
                fatal=True)
147
144
    if config('prefer-ipv6'):
148
145
        setup_ipv6()
149
146
        sync_db_with_multi_ipv6_addresses(config('database'),
156
153
    else:
157
154
        if openstack_upgrade_available('neutron-server'):
158
155
            do_openstack_upgrade(CONFIGS)
 
156
 
 
157
    apt_install(filter_installed_packages(
 
158
                determine_packages(config('openstack-origin'))),
 
159
                fatal=True)
159
160
    configure_https()
160
161
    update_nrpe_config()
161
162
    CONFIGS.write_all()