Merge lp:~gnuoy/charms/trusty/neutron-api/move-aptinstall into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3675 neutron-api-next for gnuoy mp256820
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3675/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #3463 neutron-api-next for gnuoy mp256820
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3463/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3465 neutron-api-next for gnuoy mp256820
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3465/

[Corey Bryant (corey.bryant)]

LGTM and tested successfully on upgrade from juno->kilo

review: Approve

=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2015-04-02 20:15:28 +0000
+++ hooks/neutron_api_hooks.py	2015-04-20 14:12:57 +0000
@@ -141,9 +141,6 @@
              ' 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 @@
     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()